Merging r40877 through r40911 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 10 Oct 2011 15:24:31 +0000 (15:24 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 10 Oct 2011 15:24:31 +0000 (15:24 +0000)
commit027e177905288fdda6e53aa3a5863b0a3312308d
tree102c7e4f6329f94f350d4bbfeb08054c88fa0fcb
parentc1aca1ddb333839892b0def35187a9924ab58883
parent9cabc57a62e8db17edd09839d7ae200239fb3618
Merging r40877 through r40911 from trunk into soc-2011-tomato
13 files changed:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/seqcache.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/intern/wm_operators.c