svn merge -r41422:41431 ^/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 1 Nov 2011 09:05:38 +0000 (09:05 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 1 Nov 2011 09:05:38 +0000 (09:05 +0000)
commit9aa901ccccb81da3cacf4acad34ba67020b5da7a
tree402b7a6c013800bbac79b06588db87c6adad762d
parentb6e445a61f69f5e288389eb6026fc23d7a9c9c1e
parent2ad80bf3bb807a5d433406794becb6aaafd415f9
svn merge -r41422:41431 ^/trunk/blender
14 files changed:
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_deform.h
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/deform.c
source/blender/blenkernel/intern/key.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/editors/include/ED_mesh.h
source/blender/editors/object/object_vgroup.c
source/blender/makesdna/DNA_object_types.h