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>2010-04-08 20:08:06 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-04-08 20:08:06 +0400
commit39d3ff135f219d7cf8248c78ebf35fc8197ae937 (patch)
treef9afcc3cfce26fa1daff895f0ee9565317628fad /source/blender/blenkernel/intern/modifier.c
parentd8b2b388a7b51e1585c39a1771bbd6494455e25d (diff)
no functional change
- convert solidify edge crease values into chars once rather then for each edge. - sort vertex was checking the array all the time when it wasnt needed.
Diffstat (limited to 'source/blender/blenkernel/intern/modifier.c')
-rw-r--r--source/blender/blenkernel/intern/modifier.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 51e4ae37cd9..7ec41aef323 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -6028,7 +6028,11 @@ static DerivedMesh *solidifyModifier_applyModifier(ModifierData *md,
if(smd->flag & MOD_SOLIDIFY_RIM) {
- static int edge_indices[4][4] = {
+ const unsigned char crease_rim= smd->crease_rim * 255.0f;
+ const unsigned char crease_outer= smd->crease_outer * 255.0f;
+ const unsigned char crease_inner= smd->crease_inner * 255.0f;
+
+ const int edge_indices[4][4] = {
{1, 0, 0, 1},
{2, 1, 1, 2},
{3, 2, 2, 3},
@@ -6041,8 +6045,8 @@ static DerivedMesh *solidifyModifier_applyModifier(ModifierData *md,
ed->v2= new_vert_arr[i] + numVerts;
ed->flag |= ME_EDGEDRAW;
- if(smd->crease_rim)
- ed->crease= smd->crease_rim * 255.0f;
+ if(crease_rim)
+ ed->crease= crease_rim;
}
/* faces */
@@ -6080,16 +6084,13 @@ static DerivedMesh *solidifyModifier_applyModifier(ModifierData *md,
mf->v2= ed->v1;
mf->v3= ed->v1 + numVerts;
mf->v4= ed->v2 + numVerts;
-
-
}
- if(smd->crease_outer > 0.0f)
- ed->crease= smd->crease_outer * 255.0f;
+ if(crease_outer)
+ ed->crease= crease_outer;
- if(smd->crease_inner > 0.0f) {
- ed= medge + (numEdges + eidx);
- ed->crease= smd->crease_inner * 255.0f;
+ if(crease_inner) {
+ medge[numEdges + eidx].crease= crease_inner;
}
}