svn merge -r40034:40051 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Fri, 9 Sep 2011 02:29:44 +0000 (02:29 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 9 Sep 2011 02:29:44 +0000 (02:29 +0000)
commit38b2618319530313d2cd5cc19f1c44355530b53b
treee668c95d22af2706a576b3e8235b211fad1f3440
parent0727893231240c840c45ae29a7c7f8c9f2d46ade
parenta59ba9a519c076aad17e00442e3fc0ad6bf26284
svn merge -r40034:40051 https://svn.blender.org/svnroot/bf-blender/trunk/blender
release/scripts/modules/bpy_types.py
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenlib/BLI_utildefines.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/RNA_access.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