From 8f886b3958b7cdc55c00e51dbbcf7b417879a110 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 23 May 2012 06:32:02 +0000 Subject: [PATCH] solidify modifier - replace VECADDFAC with inline function. --- source/blender/modifiers/intern/MOD_solidify.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c index 5462bf2f97a..92a3f6735ff 100644 --- a/source/blender/modifiers/intern/MOD_solidify.c +++ b/source/blender/modifiers/intern/MOD_solidify.c @@ -55,6 +55,14 @@ typedef struct EdgeFaceRef { int f2; } EdgeFaceRef; +/* spesific function for solidify - define locally */ +BLI_INLINE void madd_v3v3short_fl(float r[3], const short a[3], const float f) +{ + r[0] += (float)a[0] * f; + r[1] += (float)a[1] * f; + r[2] += (float)a[2] * f; +} + static void dm_calc_normal(DerivedMesh *dm, float (*temp_nors)[3]) { int i, numVerts, numEdges, numFaces; @@ -422,7 +430,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, scalar_short_vgroup = (offset_fac_vg + (scalar_short_vgroup * offset_fac_vg_inv)) * scalar_short; dv++; } - VECADDFAC(mv->co, mv->co, mv->no, scalar_short_vgroup); + madd_v3v3short_fl(mv->co, mv->no, scalar_short_vgroup); } } @@ -437,7 +445,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, scalar_short_vgroup = (offset_fac_vg + (scalar_short_vgroup * offset_fac_vg_inv)) * scalar_short; dv++; } - VECADDFAC(mv->co, mv->co, mv->no, scalar_short_vgroup); + madd_v3v3short_fl(mv->co, mv->no, scalar_short_vgroup); } }