diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-12-21 02:08:24 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-21 02:08:24 +0400 |
commit | 1fef05084e674e4e41388f63b95a2c71aec20a16 (patch) | |
tree | af2ac86bdefeea596b5474c05ef94788e5fd683d /source/blender/modifiers/intern/MOD_weightvgmix.c | |
parent | deb3b7e282c9fed045201ca39d682baf3a281ffe (diff) | |
parent | 2d1de2e78d619ffd999876768a9466d083984a9f (diff) |
svn merge ^/trunk/blender -r42761:42776
Diffstat (limited to 'source/blender/modifiers/intern/MOD_weightvgmix.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_weightvgmix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.c b/source/blender/modifiers/intern/MOD_weightvgmix.c index 34e73adb4b4..316080ba4a7 100644 --- a/source/blender/modifiers/intern/MOD_weightvgmix.c +++ b/source/blender/modifiers/intern/MOD_weightvgmix.c @@ -386,7 +386,7 @@ ModifierTypeInfo modifierType_WeightVGMix = { /* name */ "VertexWeightMix", /* structName */ "WeightVGMixModifierData", /* structSize */ sizeof(WeightVGMixModifierData), - /* type */ eModifierTypeType_Nonconstructive, + /* type */ eModifierTypeType_NonGeometrical, /* flags */ eModifierTypeFlag_AcceptsMesh /* |eModifierTypeFlag_SupportsMapping*/ |eModifierTypeFlag_SupportsEditmode, |