svn merge ^/trunk/blender -r42261:42290
authorCampbell Barton <ideasman42@gmail.com>
Wed, 30 Nov 2011 09:31:11 +0000 (09:31 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 30 Nov 2011 09:31:11 +0000 (09:31 +0000)
commit9e5b28cd42a3cf87ac76e3b27b52dce08071d244
treeeb14ff117faf3f6c524ea0a09389da313044d105
parent274080025d315dc08f9291bddc6d4235ed0fc8e0
parentc9edbab08a4854ad6e79abdfaaee65e0f9301ac0
svn merge ^/trunk/blender -r42261:42290
14 files changed:
release/scripts/startup/bl_ui/space_info.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/deform.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/object/object_transform.c
source/blender/editors/object/object_vgroup.c
source/blender/render/intern/source/convertblender.c