svn merge -r41723:41751 ^/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Fri, 11 Nov 2011 06:37:29 +0000 (06:37 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 11 Nov 2011 06:37:29 +0000 (06:37 +0000)
commiteadb192986bab5c7f831d292268c8627871d1acb
tree9891101df46a4d3640960a27894866d7927de1ac
parent92d35b74e79e63ae95732cf3161e84ace1e79e59
parent1649521abe637b5af74174eda0d8ca0b5f1c6ceb
svn merge -r41723:41751 ^/trunk/blender
CMakeLists.txt
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/object.c
source/blender/blenlib/intern/threads.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/modifiers/intern/MOD_build.c
source/blenderplayer/bad_level_call_stubs/stubs.c