Merging r41120 through from trunk r41139 into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 20 Oct 2011 09:49:39 +0000 (09:49 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 20 Oct 2011 09:49:39 +0000 (09:49 +0000)
28 files changed:
1  2 
CMakeLists.txt
build_files/scons/tools/Blender.py
release/scripts/startup/bl_operators/presets.py
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenloader/intern/readblenentry.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/gpencil/editaction_gpencil.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/object/object_constraint.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/WM_types.h
source/blender/windowmanager/intern/wm_operators.c
source/creator/CMakeLists.txt
source/creator/creator.c
source/gameengine/Ketsji/KX_KetsjiEngine.cpp
source/gameengine/Rasterizer/RAS_FramingManager.cpp

diff --cc CMakeLists.txt
Simple merge
@@@ -316,13 -316,9 +316,13 @@@ def creator(env)
      if env['WITH_BF_TIFF']:
          defs.append('WITH_TIFF')
  
-     if not env['WITH_BF_SDL']:
-         defs.append('DISABLE_SDL')
+     if env['WITH_BF_SDL']:
+         defs.append('WITH_SDL')
  
 +    if env['WITH_BF_LIBMV']:
 +        incs.append('#/extern/libmv')
 +        defs.append('WITH_LIBMV')
 +
      if env['WITH_BF_PYTHON']:
          incs.append('#/source/blender/python')
          defs.append('WITH_PYTHON')
Simple merge
Simple merge
Simple merge