svn merge ^/trunk/blender -r42761:42776
authorCampbell Barton <ideasman42@gmail.com>
Tue, 20 Dec 2011 22:08:24 +0000 (22:08 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 20 Dec 2011 22:08:24 +0000 (22:08 +0000)
1  2 
source/blender/blenkernel/BKE_modifier.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/object/object_modifier.c
source/blender/modifiers/intern/MOD_uvproject.c
source/blender/modifiers/intern/MOD_weightvgedit.c
source/blender/modifiers/intern/MOD_weightvgmix.c
source/blender/modifiers/intern/MOD_weightvgproximity.c