diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-07-11 13:15:20 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-07-11 13:15:20 +0400 |
| commit | 9fb2e5dde70bd971dabfdf3b1099d92241dc96ed (patch) | |
| tree | a9948718d7d0e49f598c2bbb8c2c704e288a46c6 /source/blender/modifiers/intern/MOD_displace.c | |
| parent | 7dfe34864e019fe08fbdfa62d4dacf158a0602bf (diff) | |
Fix #27930: many modifiers crashed when used on a lattice with a vertex group.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_displace.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_displace.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c index 01f1b6fb2a7..e0482e6b3fc 100644 --- a/source/blender/modifiers/intern/MOD_displace.c +++ b/source/blender/modifiers/intern/MOD_displace.c @@ -169,7 +169,7 @@ static void displaceModifier_do( { int i; MVert *mvert; - MDeformVert *dvert = NULL; + MDeformVert *dvert; int defgrp_index; float (*tex_co)[3]; float weight= 1.0f; /* init value unused but some compilers may complain */ @@ -177,11 +177,8 @@ static void displaceModifier_do( if(!dmd->texture) return; if(dmd->strength == 0.0f) return; - defgrp_index = defgroup_name_index(ob, dmd->defgrp_name); - mvert = CDDM_get_verts(dm); - if(defgrp_index >= 0) - dvert = dm->getVertDataArray(dm, CD_MDEFORMVERT); + modifier_get_vgroup(ob, dm, dmd->defgrp_name, &dvert, &defgrp_index); tex_co = MEM_callocN(sizeof(*tex_co) * numVerts, "displaceModifier_do tex_co"); |