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_meshdeform.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_meshdeform.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_meshdeform.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c index e6495348a61..22a6c28557f 100644 --- a/source/blender/modifiers/intern/MOD_meshdeform.c +++ b/source/blender/modifiers/intern/MOD_meshdeform.c @@ -284,10 +284,7 @@ static void meshdeformModifier_do( copy_v3_v3(dco[a], co); } - defgrp_index = defgroup_name_index(ob, mmd->defgrp_name); - - if(dm && defgrp_index >= 0) - dvert= dm->getVertDataArray(dm, CD_MDEFORMVERT); + modifier_get_vgroup(ob, dm, mmd->defgrp_name, &dvert, &defgrp_index); /* do deformation */ fac= 1.0f; |