svn merge -r36603:36628 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Thu, 12 May 2011 05:35:19 +0000 (05:35 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 12 May 2011 05:35:19 +0000 (05:35 +0000)
13 files changed:
1  2 
intern/ghost/intern/GHOST_SystemWin32.h
source/blender/CMakeLists.txt
source/blender/SConscript
source/blender/blenloader/SConscript
source/blender/blenloader/intern/readfile.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/makesdna/DNA_windowmanager_types.h
source/blenderplayer/CMakeLists.txt
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt

Simple merge
Simple merge
index b3cb98abb9bfdf709985d4303fc4fb216b3fcf8d,be9908d84e66350091ac69f80548191807e5d1e4..f00f765bba431bdc1444cba838b4959ba8a17693
@@@ -4,8 -4,8 +4,8 @@@ Import ('env'
  sources = env.Glob('intern/*.c')
  
  incs = '. #/intern/guardedalloc ../blenlib ../blenkernel'
- incs += ' ../makesdna ../readblenfile ../editors/include'
+ incs += ' ../makesdna ../editors/include'
 -incs += ' ../render/extern/include ../makesrna'
 +incs += ' ../render/extern/include ../makesrna ../bmesh'
  
  incs += ' ' + env['BF_ZLIB_INC']
  
Simple merge
Simple merge