svn merge -r39991:40034 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Thu, 8 Sep 2011 08:29:49 +0000 (08:29 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 8 Sep 2011 08:29:49 +0000 (08:29 +0000)
1  2 
release/scripts/modules/bpy_types.py
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/intern/MOD_weightvgedit.c
source/blender/modifiers/intern/MOD_weightvgmix.c
source/blender/modifiers/intern/MOD_weightvgproximity.c

Simple merge