diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-04-21 01:38:55 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-04-21 01:38:55 +0400 |
| commit | 24eedb2175896dd5d7e145486f3f3c6455511fca (patch) | |
| tree | ea516ee8892908cd45e5276d82425ce93c016d75 /source/blender/blenkernel/intern/armature.c | |
| parent | 37542017209bf831235fb1645d31b0275642da87 (diff) | |
vertex group option for lattice, needed for applying a lattice to a beard/moustache without moving the roots about.
Diffstat (limited to 'source/blender/blenkernel/intern/armature.c')
| -rw-r--r-- | source/blender/blenkernel/intern/armature.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 04d5acb11cc..47f3530dd07 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -54,6 +54,7 @@ #include "BKE_curve.h" #include "BKE_depsgraph.h" #include "BKE_DerivedMesh.h" +#include "BKE_deform.h" #include "BKE_displist.h" #include "BKE_global.h" #include "BKE_idprop.h" @@ -368,7 +369,7 @@ int bone_autoside_name (char *name, int strip_number, short axis, float head, fl char extension[5]={""}; len= strlen(name); - if (len == 0) return; + if (len == 0) return 0; strcpy(basename, name); /* Figure out extension to append: @@ -924,7 +925,7 @@ void armature_deform_verts(Object *armOb, Object *target, DerivedMesh *dm, int numGroups = 0; /* safety for vertexgroup index overflow */ int i, target_totvert = 0; /* safety for vertexgroup overflow */ int use_dverts = 0; - int armature_def_nr = -1; + int armature_def_nr; int totchan; if(arm->edbo) return; @@ -956,9 +957,7 @@ void armature_deform_verts(Object *armOb, Object *target, DerivedMesh *dm, } /* get the def_nr for the overall armature vertex group if present */ - for(i = 0, dg = target->defbase.first; dg; i++, dg = dg->next) - if(defgrp_name && strcmp(defgrp_name, dg->name) == 0) - armature_def_nr = i; + armature_def_nr= defgroup_name_index(target, defgrp_name); /* get a vertex-deform-index to posechannel array */ if(deformflag & ARM_DEF_VGROUP) { |