svn merge -r39890:39951 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 6 Sep 2011 03:16:12 +0000 (03:16 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 6 Sep 2011 03:16:12 +0000 (03:16 +0000)
24 files changed:
1  2 
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/mesh_validate.c
source/blender/blenlib/BLI_math_vector.h
source/blender/blenloader/SConscript
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/object/object_modifier.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/SConscript
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/SConscript
source/blender/modifiers/intern/MOD_screw.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt

index f00f765bba431bdc1444cba838b4959ba8a17693,d5d2df3ea357e739e9c3548d684b053241910c95..57075ac3bcf4393ce6040065942d7f053ecfb6e5
@@@ -5,7 -5,7 +5,7 @@@ sources = env.Glob('intern/*.c'
  
  incs = '. #/intern/guardedalloc ../blenlib ../blenkernel'
  incs += ' ../makesdna ../editors/include'
- incs += ' ../render/extern/include ../makesrna ../bmesh'
 -incs += ' ../render/extern/include ../makesrna ../nodes'
++incs += ' ../render/extern/include ../makesrna ../nodes ../bmesh'
  
  incs += ' ' + env['BF_ZLIB_INC']
  
Simple merge
index 8a53005cdddbdf509080d7eb858b01c584fa868b,10b20fc795a19997e5e67199e4459be9813b71ac..88ef8635afd54eecb1e012cca2b76e79ea2809f7
@@@ -8,7 -8,8 +8,8 @@@ objs += 
  
  incs = '#/intern/guardedalloc #/intern/memutil #/intern/audaspace/intern ../blenkernel ../blenlib ../makesdna intern .'
  incs += ' ../windowmanager ../editors/include ../gpu ../imbuf ../ikplugin ../blenfont ../blenloader'
 -incs += ' ../render/extern/include'
 +incs += ' ../render/extern/include ../bmesh'
+ incs += ' ../nodes'
  incs += ' #/extern/glew/include'
  
  defs = []
index 1097b238cae8b47bee7a2dd4478bfbfb39bb796e,1d942de348b7b8a498c12f0d5b8194b02271fb1b..c0008cc163d6135ae0b00a1de5be9a0ecb8c5e8f
@@@ -32,7 -32,7 +32,8 @@@ set(IN
        ../blenlib
        ../blenloader
        ../makesdna
+       ../makesrna
 +      ../bmesh
        ../render/extern/include
        ../../../intern/elbeem/extern
        ../../../intern/guardedalloc
index c1fb4ea61d049a0bd37348928a1153665c2b8ea3,66dd00f02486ef60e56da3000c26d6c8b4f97b86..bc83700aaa69b36102b78383ee2e40d7cd423900
@@@ -5,8 -5,8 +5,8 @@@ sources = env.Glob('intern/*.c'
  
  incs = '. ./intern'
  incs += ' #/intern/guardedalloc #/intern/decimation/extern #/intern/bsp/extern #/intern/elbeem/extern'
 -incs += ' ../render/extern/include ../blenloader'
 +incs += ' ../render/extern/include ../blenloader ../bmesh'
- incs += ' ../include ../blenlib ../makesdna ../blenkernel ../blenkernel/intern'
+ incs += ' ../include ../blenlib ../makesdna ../makesrna ../blenkernel ../blenkernel/intern'
  
  incs += ' ' + env['BF_ZLIB_INC']
  
Simple merge