Merging r40990 through r41036 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sat, 15 Oct 2011 19:19:24 +0000 (19:19 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sat, 15 Oct 2011 19:19:24 +0000 (19:19 +0000)
commit70c8e65021f6ab376f126255d412b526db2d8073
tree76901a7651e0dcdcc70ccc2c1efa1060a611ac5a
parent594e9e0689b773af852a17353010d26024485937
parent1c8a91d4df9593f3a24efbf945afabb0efa80ccc
Merging r40990 through r41036 from trunk into soc-2011-tomato
21 files changed:
build_files/scons/tools/Blender.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/idcode.c
source/blender/blenkernel/intern/movieclip.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/collada/DocumentImporter.cpp
source/blender/editors/gpencil/editaction_gpencil.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/imbuf/intern/filter.c
source/blender/makesdna/DNA_constraint_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/creator/CMakeLists.txt
source/gameengine/Converter/BL_BlenderDataConversion.cpp