svn merge -r40124:40140 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Mon, 12 Sep 2011 00:38:57 +0000 (00:38 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 12 Sep 2011 00:38:57 +0000 (00:38 +0000)
1  2 
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/editors/transform/transform.c
source/blender/editors/util/CMakeLists.txt
source/blender/editors/util/SConscript
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/SConscript
source/creator/creator.c

Simple merge
index 04d783e1ee13ec1f3111e2ed7b78872ade5e425c,cfbc735eb5c5ff11b67fadcca6b9bde89c4ca48a..16501c5955112f0e8e4625c63eb7ef15325d9493
@@@ -5,11 -5,7 +5,7 @@@ sources = env.Glob('*.c'
  
  incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
  incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 -incs += ' ../../makesrna'
 +incs += ' ../../makesrna ../../bmesh'
- incs += ' #extern/recastnavigation/Recast/Include'
  incs += ' ../../blenloader'
  
- if not env['WITH_BF_GAMEENGINE']:
-     sources.remove('navmesh_conversion.cpp')
  env.BlenderLib ( 'bf_editors_util', sources, Split(incs), [], libtype=['core','player'], priority=[330,210] )
index d6f1d5108f8a19ce66dfe0d2952ad205812c66e8,da37539e95047e7c8672d4b5967f2e3b4a6e9c68..635fd2100ba3d06a8f0ce47ba21478dc52871071
@@@ -5,10 -5,9 +5,9 @@@ sources = env.Glob('intern/*.c') + env.
  
  incs = '. ./intern'
  incs += ' #/intern/guardedalloc #/intern/decimation/extern #/intern/bsp/extern #/intern/elbeem/extern #/extern/glew/include'
 -incs += ' ../render/extern/include ../blenloader'
 +incs += ' ../render/extern/include ../blenloader ../bmesh'
  incs += ' ../include ../blenlib ../makesdna ../makesrna ../blenkernel ../blenkernel/intern'
- incs += ' ../editors/include ../gpu'
- incs += ' #extern/recastnavigation/Recast/Include'
+ incs += ' ../gpu'
  
  incs += ' ' + env['BF_ZLIB_INC']
  
Simple merge