diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-07-26 07:00:55 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-07-26 07:00:55 +0400 |
| commit | 794f3291fed5f85f8057a49683acdcb80edb0a02 (patch) | |
| tree | 90dcffc20aef49385116f25651d2edec9a04d308 /source/blender/modifiers/intern/MOD_displace.c | |
| parent | e59ef5e419b52e16f831bfc31c5773419c546ae1 (diff) | |
| parent | 9fb2e5dde70bd971dabfdf3b1099d92241dc96ed (diff) | |
svn merge -r38200:38300 https://svn.blender.org/svnroot/bf-blender/trunk/blender, source/blender/gpu/intern/gpu_buffers.c updated from trunk and re-made edits to use getTessFace* functions.
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 4e60150e339..15af3132b04 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"); |