Merging r40615 through r40652 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 28 Sep 2011 10:45:39 +0000 (10:45 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 28 Sep 2011 10:45:39 +0000 (10:45 +0000)
14 files changed:
1  2 
build_files/scons/tools/Blender.py
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/idcode.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenlib/intern/threads.c
source/blender/blenloader/intern/readblenentry.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/windowmanager/intern/wm_operators.c
source/creator/CMakeLists.txt

Simple merge
Simple merge