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_cast.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_cast.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_cast.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c index 1069b1e7098..0327497d267 100644 --- a/source/blender/modifiers/intern/MOD_cast.c +++ b/source/blender/modifiers/intern/MOD_cast.c @@ -177,10 +177,7 @@ static void sphere_do( /* 3) if we were given a vertex group name, * only those vertices should be affected */ - defgrp_index = defgroup_name_index(ob, cmd->defgrp_name); - - if ((ob->type == OB_MESH) && dm && defgrp_index >= 0) - dvert = dm->getVertDataArray(dm, CD_MDEFORMVERT); + modifier_get_vgroup(ob, dm, cmd->defgrp_name, &dvert, &defgrp_index); if(flag & MOD_CAST_SIZE_FROM_RADIUS) { len = cmd->radius; @@ -335,10 +332,7 @@ static void cuboid_do( /* 3) if we were given a vertex group name, * only those vertices should be affected */ - defgrp_index = defgroup_name_index(ob, cmd->defgrp_name); - - if ((ob->type == OB_MESH) && dm && defgrp_index >= 0) - dvert = dm->getVertDataArray(dm, CD_MDEFORMVERT); + modifier_get_vgroup(ob, dm, cmd->defgrp_name, &dvert, &defgrp_index); if (ctrl_ob) { if(flag & MOD_CAST_USE_OB_TRANSFORM) { |