svn merge ^/trunk/blender -r42495:42516
authorCampbell Barton <ideasman42@gmail.com>
Thu, 8 Dec 2011 17:32:37 +0000 (17:32 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 8 Dec 2011 17:32:37 +0000 (17:32 +0000)
commit980e68175be6f02b4d3e0f3ba9a5902e0cf2719a
tree545ba1badd4703f8fe8e3d0ba9f12e06e56ac905
parent5c377f5f872df94b77e2e40dbdeceb751e631924
parent7797c1dc424b1f772f23a3b8730a8374012d8c8b
svn merge ^/trunk/blender -r42495:42516
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/deform.c
source/blender/blenkernel/intern/mesh_validate.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/modifiers/intern/MOD_hook.c
source/blender/modifiers/intern/MOD_weightvg_util.c