svn merge -r41480:41503 ^/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Thu, 3 Nov 2011 22:58:05 +0000 (22:58 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 3 Nov 2011 22:58:05 +0000 (22:58 +0000)
commit70b74022528868342836fe0ea2bba573d350e260
tree636ae77810d5ab028fcc1f20f748dfb2f890bd45
parenta9dc6038e07c550f5968d2adcc6d441e4992929b
parent224c26f891cb2495a0d94a092e46f13784af6e6b
svn merge -r41480:41503 ^/trunk/blender
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/imbuf/intern/moviecache.c
source/blender/makesrna/RNA_access.h
source/blender/render/intern/source/convertblender.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/creator.c