svn merge -r40104:40117 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Sun, 11 Sep 2011 08:28:16 +0000 (08:28 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 11 Sep 2011 08:28:16 +0000 (08:28 +0000)
1  2 
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/shrinkwrap.c
source/blender/editors/armature/meshlaplacian.c
source/blender/editors/object/CMakeLists.txt
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/drawvolume.c
source/blender/editors/util/CMakeLists.txt
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/intern/MOD_weightvgproximity.c
source/blender/render/intern/source/convertblender.c
source/blenderplayer/CMakeLists.txt

index c1e618fd4cb09a0ad6fbc7d0f5561f6ee88f0006,c64b16c2d0828b1327d44a1ffb543b99c395446f..97f5d508d262cd26f5cafd7ee6664f0687b56eef
@@@ -24,8 -24,6 +24,7 @@@ set(IN
        ../../blenkernel
        ../../blenlib
        ../../blenloader
-       ../../../../extern/recastnavigation/Recast/Include
 +      ../../bmesh
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 8c58e4f3a3368e8a8fd68f77a8a9049d40b03e80,083ad052a58f8243a5fec92635f579a49ce4fe16..9a35e9762df6c53471a6e4e4a6472f2282853ec6
@@@ -33,13 -33,9 +33,10 @@@ set(IN
        ../blenloader
        ../makesdna
        ../makesrna
 +      ../bmesh
        ../render/extern/include
-       ../editors/include
-       ../gpu
        ../../../intern/elbeem/extern
        ../../../intern/guardedalloc
-       ../../../extern/recastnavigation/Recast/Include
  )
  
  set(INC_SYS
Simple merge