Hi Tamito-san, ME_DRAW_FREESTYLE_EDGE (1 << 14) conflicts with ME_DRAWEXTRA_INDICES. Campbell changed the ME_DRAWEXTRA_INDICES from (1 << 13) to (1 << 14) when adding ME_DRAWEXTRA_EDGEANG in r55660.
Thanks, IRIE Shinsuke 13/04/01, Tamito Kajiyama wrote: > Revision: 55702 > > http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55702 > Author: kjym3 > Date: 2013-04-01 13:47:19 +0000 (Mon, 01 Apr 2013) > Log Message: > ----------- > Merged changes in the trunk up to revision 55700. > > Conflicts resolved: > source/blender/editors/mesh/mesh_intern.h > > Revision Links: > -------------- > > http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55700 > > Modified Paths: > -------------- > branches/soc-2008-mxcurioni/CMakeLists.txt > branches/soc-2008-mxcurioni/GNUmakefile > branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh > branches/soc-2008-mxcurioni/build_files/buildbot/slave_compile.py > > branches/soc-2008-mxcurioni/build_files/cmake/cmake_static_check_cppcheck.py > > branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py > branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py > > branches/soc-2008-mxcurioni/build_files/scons/config/win64-mingw-config.py > branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py > branches/soc-2008-mxcurioni/extern/recastnavigation/recast-capi.cpp > branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp > branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h > branches/soc-2008-mxcurioni/intern/cycles/blender/addon/properties.py > branches/soc-2008-mxcurioni/intern/cycles/blender/addon/ui.py > branches/soc-2008-mxcurioni/intern/cycles/blender/blender_session.cpp > branches/soc-2008-mxcurioni/intern/cycles/blender/blender_util.h > branches/soc-2008-mxcurioni/intern/cycles/render/graph.cpp > branches/soc-2008-mxcurioni/intern/dualcon/intern/octree.h > branches/soc-2008-mxcurioni/intern/elbeem/intern/solver_init.cpp > branches/soc-2008-mxcurioni/intern/ffmpeg/ffmpeg_compat.h > branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_sys_types.h > branches/soc-2008-mxcurioni/intern/opencolorio/CMakeLists.txt > branches/soc-2008-mxcurioni/intern/opencolorio/SConscript > branches/soc-2008-mxcurioni/intern/opencolorio/fallback_impl.cc > branches/soc-2008-mxcurioni/intern/opencolorio/ocio_capi.cc > branches/soc-2008-mxcurioni/intern/opencolorio/ocio_capi.h > branches/soc-2008-mxcurioni/intern/opencolorio/ocio_impl.cc > branches/soc-2008-mxcurioni/intern/opencolorio/ocio_impl.h > branches/soc-2008-mxcurioni/intern/opennl/superlu/superlu_sys_types.h > branches/soc-2008-mxcurioni/intern/utfconv/utf_winfunc.c > branches/soc-2008-mxcurioni/intern/utfconv/utf_winfunc.h > branches/soc-2008-mxcurioni/intern/utfconv/utfconv.h > > branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py > > branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/settings.py > > branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/utils.py > > branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/anim_utils.py > branches/soc-2008-mxcurioni/release/scripts/modules/bpy_types.py > > branches/soc-2008-mxcurioni/release/scripts/modules/console/complete_import.py > > branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/add_mesh_torus.py > branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/node.py > > branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/rigidbody.py > branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/wm.py > > branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_paint_common.py > > branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_common.py > > branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_render.py > branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_image.py > branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_nla.py > branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py > > branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_sequencer.py > > branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref.py > > branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref_keymap.py > branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d.py > > branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d_toolbar.py > branches/soc-2008-mxcurioni/release/windows/contrib/vfapi/vfapi-plugin.c > branches/soc-2008-mxcurioni/source/blender/blenfont/BLF_translation.h > branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_DerivedMesh.h > branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h > branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h > branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c > branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c > branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c > > branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c > branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c > branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sca.c > branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqeffects.c > branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_listbase.h > branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_vector.h > branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_string.h > branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_dynstr.c > branches/soc-2008-mxcurioni/source/blender/blenlib/intern/DLRB_tree.c > branches/soc-2008-mxcurioni/source/blender/blenlib/intern/fileops.c > branches/soc-2008-mxcurioni/source/blender/blenlib/intern/freetypefont.c > branches/soc-2008-mxcurioni/source/blender/blenlib/intern/graph.c > branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_interp.c > > branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector_inline.c > branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c > branches/soc-2008-mxcurioni/source/blender/blenlib/intern/string.c > branches/soc-2008-mxcurioni/source/blender/blenlib/intern/string_utf8.c > branches/soc-2008-mxcurioni/source/blender/blenlib/intern/threads.c > branches/soc-2008-mxcurioni/source/blender/blenloader/BLO_sys_types.h > branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c > > branches/soc-2008-mxcurioni/source/blender/blenloader/intern/versioning_250.c > branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c > branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_iterators.c > branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_iterators.h > branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_beautify.c > branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_bevel.c > branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_connect.c > branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_create.c > branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_dissolve.c > branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_dupe.c > > branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_edgeloop_fill.c > branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_edgenet.c > branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_extrude.c > branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_hull.c > branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_inset.c > > branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_join_triangles.c > branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_mirror.c > > branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_primitive.c > > branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_removedoubles.c > > branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_smooth_laplacian.c > > branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_subdivide.c > > branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_symmetrize.c > > branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_triangulate.c > > branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_unsubdivide.c > > branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_wireframe.c > branches/soc-2008-mxcurioni/source/blender/bmesh/tools/bmesh_bevel.c > > branches/soc-2008-mxcurioni/source/blender/bmesh/tools/bmesh_decimate_collapse.c > branches/soc-2008-mxcurioni/source/blender/collada/AnimationImporter.h > branches/soc-2008-mxcurioni/source/blender/collada/ArmatureImporter.h > branches/soc-2008-mxcurioni/source/blender/collada/ExtraHandler.cpp > branches/soc-2008-mxcurioni/source/blender/collada/ExtraHandler.h > branches/soc-2008-mxcurioni/source/blender/collada/SConscript > > branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_ExecutionGroup.cpp > > branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_defines.c > > branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_markers.c > branches/soc-2008-mxcurioni/source/blender/editors/armature/reeb.c > branches/soc-2008-mxcurioni/source/blender/editors/include/ED_anim_api.h > branches/soc-2008-mxcurioni/source/blender/editors/include/ED_clip.h > branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mesh.h > branches/soc-2008-mxcurioni/source/blender/editors/include/ED_types.h > branches/soc-2008-mxcurioni/source/blender/editors/include/UI_resources.h > > branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_draw.c > branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c > branches/soc-2008-mxcurioni/source/blender/editors/mesh/CMakeLists.txt > branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_add.c > branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_bvh.c > branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_knife.c > > branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_knife_project.c > > branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_loopcut.c > branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_rip.c > branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_select.c > branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c > branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_utils.c > branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_data.c > branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_intern.h > branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_navmesh.c > branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_ops.c > branches/soc-2008-mxcurioni/source/blender/editors/mesh/meshtools.c > > branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c > > branches/soc-2008-mxcurioni/source/blender/editors/physics/dynamicpaint_ops.c > > branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_edit.c > > branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_fluid.c > > branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c > branches/soc-2008-mxcurioni/source/blender/editors/screen/glutil.c > > branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_cursor.c > > branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c > > branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image_2d.c > > branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image_proj.c > > branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_intern.h > > branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c > > branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_stroke.c > > branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_utils.c > > branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c > branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c > > branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_ops.c > branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_draw.c > > branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_editor.c > > branches/soc-2008-mxcurioni/source/blender/editors/space_clip/space_clip.c > branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c > branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c > > branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_select.c > > branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_draw.c > > branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c > > branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c > > branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_manipulator.c > > branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_ops.c > branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_codegen.c > branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c > branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_extensions.c > > branches/soc-2008-mxcurioni/source/blender/gpu/shaders/gpu_shader_material.glsl > > branches/soc-2008-mxcurioni/source/blender/gpu/shaders/gpu_shader_simple_frag.glsl > branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_colormanagement.h > branches/soc-2008-mxcurioni/source/blender/imbuf/intern/IMB_indexer.h > branches/soc-2008-mxcurioni/source/blender/imbuf/intern/colormanagement.c > > branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/DirectDrawSurface.h > branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/Image.h > branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/PixelFormat.h > branches/soc-2008-mxcurioni/source/blender/imbuf/intern/rectop.c > branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_ID.h > branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_brush_types.h > branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_mesh_types.h > branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sequence_types.h > branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h > branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_texture_types.h > branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h > branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c > branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c > branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_brush.c > branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mask.c > branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c > branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c > branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c > > branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c > branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_test.c > branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c > branches/soc-2008-mxcurioni/source/blender/nodes/NOD_socket.h > branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_common.c > branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_socket.c > > branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_geom.c > > branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_math.c > > branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_math.c > > branches/soc-2008-mxcurioni/source/blender/render/intern/source/imagetexture.c > > branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c > > branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c > > branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_init_exit.c > > branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c > branches/soc-2008-mxcurioni/source/blender/windowmanager/wm_files.h > branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt > branches/soc-2008-mxcurioni/source/gameengine/Expressions/Value.h > branches/soc-2008-mxcurioni/source/gameengine/Expressions/VoidValue.h > branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_MeshProxy.h > branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonSeq.cpp > > branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_BucketManager.cpp > > branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_BucketManager.h > branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/Exception.h > branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/FilterBase.cpp > branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/FilterBase.h > > branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/FilterBlueScreen.h > branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/FilterNormal.h > branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/FilterSource.h > branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/ImageBase.cpp > branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/ImageBase.h > branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/ImageBuff.cpp > branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/ImageMix.cpp > branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/ImageMix.h > > branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/ImageRender.cpp > branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/ImageRender.h > branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/PyTypeList.cpp > branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/VideoBase.cpp > branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/VideoBase.h > branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/VideoFFmpeg.h > branches/soc-2008-mxcurioni/source/tools/check_style_c.py > branches/soc-2008-mxcurioni/source/tools/spell_check_source_config.py > > Added Paths: > ----------- > branches/soc-2008-mxcurioni/intern/opencolorio/ocio_impl_glsl.cc > branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_bevel.c > > branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_extrude.c > branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_inset.c > > Property Changed: > ---------------- > branches/soc-2008-mxcurioni/ > > branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/add_mesh_torus.py > branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py > > > Property changes on: branches/soc-2008-mxcurioni > ___________________________________________________________________ > Modified: svn:mergeinfo > - > /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794 > /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439 > /branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573 > /trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-55635 > + > /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794 > /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439 > /branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573 > /trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-55700 > > Modified: branches/soc-2008-mxcurioni/CMakeLists.txt > =================================================================== > --- branches/soc-2008-mxcurioni/CMakeLists.txt 2013-04-01 13:41:45 UTC > (rev 55701) > +++ branches/soc-2008-mxcurioni/CMakeLists.txt 2013-04-01 13:47:19 UTC > (rev 55702) > @@ -1070,28 +1070,28 @@ > set(OPENCOLLADA ${LIBDIR}/opencollada) > > set(OPENCOLLADA_INCLUDE_DIRS > - > ${LIBDIR}/opencollada/include/COLLADAStreamWriter/include > - > ${LIBDIR}/opencollada/include/COLLADABaseUtils/include > - > ${LIBDIR}/opencollada/include/COLLADAFramework/include > - > ${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader/include > - > ${LIBDIR}/opencollada/include/GeneratedSaxParser/include > + > ${OPENCOLLADA}/include/opencollada/COLLADAStreamWriter > + > ${OPENCOLLADA}/include/opencollada/COLLADABaseUtils > + > ${OPENCOLLADA}/include/opencollada/COLLADAFramework > + > ${OPENCOLLADA}/include/opencollada/COLLADASaxFrameworkLoader > + > ${OPENCOLLADA}/include/opencollada/GeneratedSaxParser > ) > set_lib_path(OPENCOLLADA_LIBPATH "opencollada") > > set(OPENCOLLADA_LIBRARIES > - > ${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADASaxFrameworkLoader.lib > - > ${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADAFramework.lib > - > ${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADABaseUtils.lib > - > ${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADAStreamWriter.lib > - ${OPENCOLLADA_LIBPATH}/lib/MathMLSolver.lib > - > ${OPENCOLLADA_LIBPATH}/lib/GeneratedSaxParser.lib > - ${OPENCOLLADA_LIBPATH}/lib/xml2.lib > - ${OPENCOLLADA_LIBPATH}/lib/buffer.lib > - ${OPENCOLLADA_LIBPATH}/lib/ftoa.lib > - ${OPENCOLLADA_LIBPATH}/lib/UTF.lib > + > ${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib > + > ${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADAFramework.lib > + > ${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADABaseUtils.lib > + > ${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADAStreamWriter.lib > + > ${OPENCOLLADA_LIBPATH}/lib/opencollada/MathMLSolver.lib > + > ${OPENCOLLADA_LIBPATH}/lib/opencollada/GeneratedSaxParser.lib > + ${OPENCOLLADA_LIBPATH}/lib/opencollada/xml.lib > + > ${OPENCOLLADA_LIBPATH}/lib/opencollada/buffer.lib > + ${OPENCOLLADA_LIBPATH}/lib/opencollada/ftoa.lib > + ${OPENCOLLADA_LIBPATH}/lib/opencollada/UTF.lib > ) > set(PCRE_LIBRARIES > - ${OPENCOLLADA_LIBPATH}/lib/pcre.lib > + ${OPENCOLLADA_LIBPATH}/lib/opencollada/pcre.lib > ) > > unset(OPENCOLLADA_LIBPATH) > @@ -1292,13 +1292,13 @@ > if(WITH_OPENCOLLADA) > set(OPENCOLLADA ${LIBDIR}/opencollada) > set(OPENCOLLADA_INCLUDE_DIRS > - > ${LIBDIR}/opencollada/include/COLLADAStreamWriter/include > - > ${LIBDIR}/opencollada/include/COLLADABaseUtils/include > - > ${LIBDIR}/opencollada/include/COLLADAFramework/include > - > ${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader/include > - > ${LIBDIR}/opencollada/include/GeneratedSaxParser/include > + ${OPENCOLLADA}/include/COLLADAStreamWriter > + ${OPENCOLLADA}/include/COLLADABaseUtils > + ${OPENCOLLADA}/include/COLLADAFramework > + ${OPENCOLLADA}/include/COLLADASaxFrameworkLoader > + ${OPENCOLLADA}/include/GeneratedSaxParser > ) > - set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib > ${OPENCOLLADA}/lib) > + set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib/opencollada) > if(WITH_MINGW64) > set(OPENCOLLADA_LIBRARIES > OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework > OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa xml) > else() > > Modified: branches/soc-2008-mxcurioni/GNUmakefile > =================================================================== > --- branches/soc-2008-mxcurioni/GNUmakefile 2013-04-01 13:41:45 UTC (rev > 55701) > +++ branches/soc-2008-mxcurioni/GNUmakefile 2013-04-01 13:47:19 UTC (rev > 55702) > @@ -272,7 +272,9 @@ > check_cppcheck: > $(CMAKE_CONFIG) > cd $(BUILD_DIR) ; \ > - python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py > + python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py > 2> \ > + $(BLENDER_DIR)/check_cppcheck.txt > + @echo "written: check_cppcheck.txt" > > check_clang_array: > $(CMAKE_CONFIG) > > Modified: > branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh > =================================================================== > --- branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh > 2013-04-01 13:41:45 UTC (rev 55701) > +++ branches/soc-2008-mxcurioni/build_files/build_environment/install_deps.sh > 2013-04-01 13:47:19 UTC (rev 55702) > @@ -1066,8 +1066,8 @@ > # XXX For now, always update from latest repo... > git pull origin master > > - # XXX We have to stick to this revision, the next one introduced a > change to ExtraHandler' parseElement signature :/ > - git checkout c89cf095c40aa2a518b1104c448825eacc92d174 > + # Stick to same rev as windows' libs... > + git checkout e886e196673222f2f4bc32b936dc96419fff815f > git reset --hard > > # Always refresh the whole build! > > Modified: branches/soc-2008-mxcurioni/build_files/buildbot/slave_compile.py > =================================================================== > --- branches/soc-2008-mxcurioni/build_files/buildbot/slave_compile.py > 2013-04-01 13:41:45 UTC (rev 55701) > +++ branches/soc-2008-mxcurioni/build_files/buildbot/slave_compile.py > 2013-04-01 13:47:19 UTC (rev 55702) > @@ -156,9 +156,9 @@ > if builder.find('win') != -1: > dlls = ('msvcm90.dll', 'msvcp90.dll', 'msvcr90.dll', > 'vcomp90.dll', 'Microsoft.VC90.CRT.manifest', > 'Microsoft.VC90.OpenMP.manifest') > if builder.find('win64') == -1: > - dlls_path = 'C:\\b\\redist\\x86' > + dlls_path = 'C:\\b\\redist\\x86' > else: > - dlls_path = 'C:\\b\\redist\\amd64' > + dlls_path = 'C:\\b\\redist\\amd64' > for dll in dlls: > shutil.copyfile(os.path.join(dlls_path, dll), > os.path.join(install_dir, dll)) > > > Modified: > branches/soc-2008-mxcurioni/build_files/cmake/cmake_static_check_cppcheck.py > =================================================================== > --- > branches/soc-2008-mxcurioni/build_files/cmake/cmake_static_check_cppcheck.py > 2013-04-01 13:41:45 UTC (rev 55701) > +++ > branches/soc-2008-mxcurioni/build_files/cmake/cmake_static_check_cppcheck.py > 2013-04-01 13:47:19 UTC (rev 55702) > @@ -41,9 +41,9 @@ > # not sure why this is needed, but it is. > "-I" + os.path.join(project_source_info.SOURCE_DIR, "extern", "glew", > "include"), > "--suppress=*:%s/extern/glew/include/GL/glew.h:241" % > project_source_info.SOURCE_DIR, > - # "--max-configs=1", # speeds up execution > + "--max-configs=1", # speeds up execution > # "--check-config", # when includes are missing > - # "--enable=all", # if you want sixty hundred pedantic suggestions > + "--enable=all", # if you want sixty hundred pedantic suggestions > ] > > if USE_QUIET: > > Modified: > branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py > =================================================================== > --- > branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py > 2013-04-01 13:41:45 UTC (rev 55701) > +++ > branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py > 2013-04-01 13:47:19 UTC (rev 55702) > @@ -141,9 +141,9 @@ > BF_COLLADA_LIB = 'bf_collada' > > BF_OPENCOLLADA = LIBDIR + '/opencollada' > -BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include' > +BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include/opencollada' > BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader > OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver > expat pcre buffer ftoa' > -BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib' > +BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib/opencollada' > > #Cycles > WITH_BF_CYCLES = True > > Modified: > branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py > =================================================================== > --- branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py > 2013-04-01 13:41:45 UTC (rev 55701) > +++ branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py > 2013-04-01 13:47:19 UTC (rev 55702) > @@ -139,9 +139,9 @@ > BF_COLLADA_LIB = 'bf_collada' > > BF_OPENCOLLADA = LIBDIR + '/opencollada' > -BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include' > -BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader > OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver > xml2 pcre buffer ftoa UTF' > -BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib' > +BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include/opencollada' > +BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader > OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml > pcre buffer ftoa UTF' > > @@ Diff output truncated at 10240 characters. @@ > _______________________________________________ > Bf-blender-cvs mailing list > bf-blender-...@blender.org > http://lists.blender.org/mailman/listinfo/bf-blender-cvs > _______________________________________________ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers