svn merge ^/trunk/blender -r43085:43092
authorCampbell Barton <ideasman42@gmail.com>
Tue, 3 Jan 2012 07:33:11 +0000 (07:33 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 3 Jan 2012 07:33:11 +0000 (07:33 +0000)
commit46f2233a9355ba09aaa9195c4da32a015f02fb8d
tree64769fdf96c089feb16d10948e8d07617c97d48a
parentc0eec8f379bb0c265e7bf2ad74397c22836bae3c
parent434c1e6df82a082fe03034a3ad3825f7b50ea533
svn merge ^/trunk/blender -r43085:43092
source/blender/editors/object/object_vgroup.c
source/blender/modifiers/SConscript