Cycles: svn merge -r41205:41225 ^/trunk/blender
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Mon, 24 Oct 2011 20:19:04 +0000 (20:19 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Mon, 24 Oct 2011 20:19:04 +0000 (20:19 +0000)
commit55ab66b45582f4973a0ba13b2573c8d5f6990652
tree86c24f0f6c0d8dd654f9c3532b9a20391177943f
parentf673fc92930836a4df2a3f3552e3a106ea966a02
parentf1cea89d99f0c80bdccd2ba1359142b5ff14cdb9
Cycles: svn merge -r41205:41225 ^/trunk/blender
CMakeLists.txt
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface_intern.h
source/blender/editors/render/render_preview.c
source/blender/python/intern/bpy_interface.c
source/blender/windowmanager/intern/wm_event_system.c