Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-05-23 10:32:02 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-05-23 10:32:02 +0400
commit8f886b3958b7cdc55c00e51dbbcf7b417879a110 (patch)
treeff2a206fe4762e65ce0ad40648a6180407e2c4b4 /source/blender/modifiers
parentf537691c6b2c72b2fb738785e3dc5713c95fa9fa (diff)
solidify modifier - replace VECADDFAC with inline function.
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r--source/blender/modifiers/intern/MOD_solidify.c12
1 files 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);
}
}