diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-10-30 12:50:35 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-10-30 12:50:35 +0300 |
| commit | 77532f6f8ac3dd3f12608a81b807f42936bbae33 (patch) | |
| tree | 78628f03f840c2f9f86cccd1eef44a937442c501 /source/blender/editors/sculpt_paint | |
| parent | ae9eae222c0a92bea637f1023a46fe44e4a2a534 (diff) | |
two things; made ctrl-p add an armature modifier instead of using PARSKEL, and also made wpaint auto-normalize work with PARSKEL armature setups
Diffstat (limited to 'source/blender/editors/sculpt_paint')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_vertex.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 4241db0e371..9d673581368 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -1264,7 +1264,7 @@ static char *wpaint_make_validmap(Mesh *me, Object *ob) bPoseChannel *chan; ArmatureModifierData *amd; GHash *gh = BLI_ghash_new(BLI_ghashutil_strhash, BLI_ghashutil_strcmp); - int i = 0; + int i = 0, step1=1; /*add all names to a hash table*/ for (dg=ob->defbase.first, i=0; dg; dg=dg->next, i++) { @@ -1277,8 +1277,8 @@ static char *wpaint_make_validmap(Mesh *me, Object *ob) validmap = MEM_callocN(i, "wpaint valid map"); /*now loop through the armature modifiers and identify deform bones*/ - for (md = ob->modifiers.first; md; md=md->next) { - if (!(md->mode & eModifierMode_Realtime)) + for (md = ob->modifiers.first; md; md= !md->next && step1 ? (step1=0), modifiers_getVirtualModifierList(ob) : md->next) { + if (!(md->mode & (eModifierMode_Realtime|eModifierMode_Virtual))) continue; if (md->type == eModifierType_Armature) |