svn merge ^/trunk/blender -r41005:41075
authorCampbell Barton <ideasman42@gmail.com>
Mon, 17 Oct 2011 03:40:10 +0000 (03:40 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 17 Oct 2011 03:40:10 +0000 (03:40 +0000)
17 files changed:
1  2 
build_files/cmake/cmake_consistency_check_config.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_paint.h
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenlib/intern/path_util.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/editors/util/crazyspace.c
source/blender/makesrna/intern/rna_scene.c
source/creator/CMakeLists.txt

@@@ -40,16 -44,11 +44,20 @@@ IGNORE = 
      "extern/eltopo/common/meshes/ObjLoader.hpp",
      "extern/eltopo/common/meshes/TriangleIndex.hpp",
      "extern/eltopo/common/meshes/meshloader.h",
 -    "extern/eltopo/eltopo3d/broadphase_blenderbvh.h"
 +    "extern/eltopo/eltopo3d/broadphase_blenderbvh.h",
 +
 +    # for bmesh branch only
 +    "source/blender/bmesh/editmesh_tools.c",
 +    "source/blender/bmesh/intern/in-progress/BME_conversions.c",
 +    "source/blender/bmesh/tools/BME_bevel.c",
 +    "source/blender/bmesh/tools/BME_dupe_ops.c",
 +    "source/blender/bmesh/tools/BME_duplicate.c",
 +    "source/blender/bmesh/tools/BME_extrude.c",
 +    "source/blender/bmesh/tools/BME_weld.c",
+     "extern/recastnavigation/Recast/Include/RecastLog.h",
+     "extern/recastnavigation/Recast/Include/RecastTimer.h",
+     "intern/audaspace/SRC/AUD_SRCResampleFactory.h",
+     "intern/audaspace/SRC/AUD_SRCResampleReader.h",
      )
  
  UTF8_CHECK = True
Simple merge
Simple merge