diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2011-07-29 10:32:30 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2011-07-29 10:32:30 +0400 |
| commit | b46d8955509e805f06b76a6fd800ecb4edee113b (patch) | |
| tree | 7ed0b1a3b5d04ab48d3e9062ff02ce54961ecb06 /source/blender/modifiers/intern/MOD_hook.c | |
| parent | 6960127d2609620d52620539388ada5cb466bab2 (diff) | |
| parent | 26589497529ca3c8da85391d4976d286a371e258 (diff) | |
Merging r36529-38806bge_components
Diffstat (limited to 'source/blender/modifiers/intern/MOD_hook.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_hook.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/source/blender/modifiers/intern/MOD_hook.c b/source/blender/modifiers/intern/MOD_hook.c index 082c199b16f..ea8d602dd7a 100644 --- a/source/blender/modifiers/intern/MOD_hook.c +++ b/source/blender/modifiers/intern/MOD_hook.c @@ -157,9 +157,8 @@ static void deformVerts(ModifierData *md, Object *ob, int i, *index_pt; const float falloff_squared= hmd->falloff * hmd->falloff; /* for faster comparisons */ - int max_dvert= 0; - MDeformVert *dvert= NULL; - int defgrp_index = -1; + MDeformVert *dvert; + int defgrp_index, max_dvert; /* get world-space matrix of target, corrected for the space the verts are in */ if (hmd->subtarget[0] && pchan) { @@ -174,21 +173,8 @@ static void deformVerts(ModifierData *md, Object *ob, mul_serie_m4(mat, ob->imat, dmat, hmd->parentinv, NULL, NULL, NULL, NULL, NULL); - if((defgrp_index= defgroup_name_index(ob, hmd->name)) != -1) { - Mesh *me = ob->data; - if(dm) { - dvert= dm->getVertDataArray(dm, CD_MDEFORMVERT); - if(dvert) { - max_dvert = numVerts; - } - } - else if(me->dvert) { - dvert= me->dvert; - if(dvert) { - max_dvert = me->totvert; - } - } - } + modifier_get_vgroup(ob, dm, hmd->name, &dvert, &defgrp_index); + max_dvert = (dvert)? numVerts: 0; /* Regarding index range checking below. * |