diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2012-01-23 00:05:26 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2012-01-23 00:05:26 +0400 |
| commit | 6eb0ca9385aaf69c89172a5826592e5ad9dac198 (patch) | |
| tree | c9262f0272a3d566077436958400cfe72ebf8461 /source/blender/modifiers/intern/MOD_weightvgedit.c | |
| parent | b54182c93fac2bd79d0c9244eaf1d553b93adcb0 (diff) | |
| parent | 1a93d8834319b890ff0cbc70231b14635603ae95 (diff) | |
Merged with trunk (-r43609:43611): updated modifier preview.
Noted preview code for DynamicPaint is currently disabled, will see if I can re-enable it…
Diffstat (limited to 'source/blender/modifiers/intern/MOD_weightvgedit.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_weightvgedit.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_weightvgedit.c b/source/blender/modifiers/intern/MOD_weightvgedit.c index e3eec5243fb..45c934654d0 100644 --- a/source/blender/modifiers/intern/MOD_weightvgedit.c +++ b/source/blender/modifiers/intern/MOD_weightvgedit.c @@ -114,6 +114,8 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md) if(wmd->mask_tex_mapping == MOD_DISP_MAP_UV) dataMask |= CD_MASK_MTFACE; + /* No need to ask for CD_WEIGHT_MCOL... */ + return dataMask; } @@ -186,8 +188,12 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der int defgrp_idx; int i; /* Flags. */ - int do_add = (wmd->edit_flags & MOD_WVG_EDIT_ADD2VG) != 0; - int do_rem = (wmd->edit_flags & MOD_WVG_EDIT_REMFVG) != 0; + int do_add = (wmd->edit_flags & MOD_WVG_EDIT_ADD2VG) != 0; + int do_rem = (wmd->edit_flags & MOD_WVG_EDIT_REMFVG) != 0; + /* Only do weight-preview in Object, Sculpt and Pose modes! */ +#if 0 + int do_prev = (wmd->modifier.mode & eModifierMode_DoWeightPreview); +#endif /* Get number of verts. */ numVerts = dm->getNumVerts(dm); @@ -244,6 +250,12 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der weightvg_update_vg(dvert, defgrp_idx, dw, numVerts, NULL, org_w, do_add, wmd->add_threshold, do_rem, wmd->rem_threshold); + /* If weight preview enabled... */ +#if 0 /* XXX Currently done in mod stack :/ */ + if(do_prev) + DM_update_weight_mcol(ob, dm, 0, org_w, 0, NULL); +#endif + /* Freeing stuff. */ MEM_freeN(org_w); MEM_freeN(new_w); @@ -267,8 +279,9 @@ ModifierTypeInfo modifierType_WeightVGEdit = { /* structSize */ sizeof(WeightVGEditModifierData), /* type */ eModifierTypeType_NonGeometrical, /* flags */ eModifierTypeFlag_AcceptsMesh -/* |eModifierTypeFlag_SupportsMapping*/ - |eModifierTypeFlag_SupportsEditmode, + |eModifierTypeFlag_SupportsMapping + |eModifierTypeFlag_SupportsEditmode + |eModifierTypeFlag_UsesPreview, /* copyData */ copyData, /* deformVerts */ NULL, |