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)
commit1fef05084e674e4e41388f63b95a2c71aec20a16
treeaf2ac86bdefeea596b5474c05ef94788e5fd683d
parentdeb3b7e282c9fed045201ca39d682baf3a281ffe
parent2d1de2e78d619ffd999876768a9466d083984a9f
svn merge ^/trunk/blender -r42761:42776
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