diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2010-03-09 07:32:40 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2010-03-09 07:32:40 +0300 |
| commit | 71003b9bcc88ecf6138c3debb9abba4637c8e61a (patch) | |
| tree | 7f85d40231311a36a72f731a7c07b8dbd6fff577 /source/blender/blenkernel/intern/shrinkwrap.c | |
| parent | ea540496c8281dcba899fb6b29c1bcfbb53a0482 (diff) | |
| parent | 790d6ca256e6b572826b2bf214c6fd6c8a623969 (diff) | |
merge with trunk at r27259 and commit of a patch by anthony jones to fix msvc (though further work may be needed because changes made by the merge
Diffstat (limited to 'source/blender/blenkernel/intern/shrinkwrap.c')
| -rw-r--r-- | source/blender/blenkernel/intern/shrinkwrap.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index 1c9e65eae73..d15b5fd95e2 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) Blender Foundation. * All rights reserved. @@ -185,7 +185,7 @@ static void shrinkwrap_calc_nearest_vertex(ShrinkwrapCalcData *calc) { float *co = calc->vertexCos[i]; float tmp_co[3]; - float weight = vertexgroup_get_vertex_weight(calc->dvert, i, calc->vgroup); + float weight = defvert_array_find_weight_safe(calc->dvert, i, calc->vgroup); if(weight == 0.0f) continue; @@ -357,7 +357,7 @@ static void shrinkwrap_calc_normal_projection(ShrinkwrapCalcData *calc, struct S { float *co = calc->vertexCos[i]; float tmp_co[3], tmp_no[3]; - float weight = vertexgroup_get_vertex_weight(calc->dvert, i, calc->vgroup); + float weight = defvert_array_find_weight_safe(calc->dvert, i, calc->vgroup); if(weight == 0.0f) continue; @@ -448,7 +448,7 @@ static void shrinkwrap_calc_nearest_surface_point(ShrinkwrapCalcData *calc) { float *co = calc->vertexCos[i]; float tmp_co[3]; - float weight = vertexgroup_get_vertex_weight(calc->dvert, i, calc->vgroup); + float weight = defvert_array_find_weight_safe(calc->dvert, i, calc->vgroup); if(weight == 0.0f) continue; //Convert the vertex to tree coordinates @@ -520,7 +520,7 @@ void shrinkwrapModifier_deform(ShrinkwrapModifierData *smd, Scene *scene, Object calc.vertexCos = vertexCos; //DeformVertex - calc.vgroup = get_named_vertexgroup_num(calc.ob, calc.smd->vgroup_name); + calc.vgroup = defgroup_name_index(calc.ob, calc.smd->vgroup_name); if(dm) { calc.dvert = dm->getVertDataArray(dm, CD_MDEFORMVERT); @@ -546,7 +546,7 @@ void shrinkwrapModifier_deform(ShrinkwrapModifierData *smd, Scene *scene, Object - calc.vgroup = get_named_vertexgroup_num(calc.ob, smd->vgroup_name); + calc.vgroup = defgroup_name_index(calc.ob, smd->vgroup_name); if(dm != NULL && smd->shrinkType == MOD_SHRINKWRAP_PROJECT) { |