archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

code cleanup: solidify modifier - remove dead assignment and unneeded NULL check.

Browse Source
This commit is contained in:
Campbell Barton
2012-05-25 06:54:01 +00:00
parent f883d12e0c
commit 29e89dc996
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/modifiers/intern/MOD_solidify.c
View File

@@ -240,7 +240,6 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
int *edge_users = NULL; int *edge_users = NULL;
char *edge_order = NULL; char *edge_order = NULL;
int *edge_origIndex;
float (*vert_nors)[3] = NULL; float (*vert_nors)[3] = NULL;
@@ -570,7 +569,6 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
} }
if (smd->flag & MOD_SOLIDIFY_RIM) { if (smd->flag & MOD_SOLIDIFY_RIM) {
int *origindex;
/* bugger, need to re-calculate the normals for the new edge faces. /* bugger, need to re-calculate the normals for the new edge faces.
* This could be done in many ways, but probably the quickest way * This could be done in many ways, but probably the quickest way
@@ -592,24 +590,26 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
const unsigned char crease_outer = smd->crease_outer * 255.0f; const unsigned char crease_outer = smd->crease_outer * 255.0f;
const unsigned char crease_inner = smd->crease_inner * 255.0f; const unsigned char crease_inner = smd->crease_inner * 255.0f;
int *origindex_edge;
int *orig_ed;
/* add faces & edges */ /* add faces & edges */
origindex = result->getEdgeDataArray(result, CD_ORIGINDEX); origindex_edge = result->getEdgeDataArray(result, CD_ORIGINDEX);
ed = medge + (numEdges * 2); ed = &medge[numEdges * 2];
for (i = 0; i < newEdges; i++, ed++) { orig_ed = &origindex_edge[numEdges * 2];
for (i = 0; i < newEdges; i++, ed++, orig_ed++) {
ed->v1 = new_vert_arr[i]; ed->v1 = new_vert_arr[i];
ed->v2 = new_vert_arr[i] + numVerts; ed->v2 = new_vert_arr[i] + numVerts;
ed->flag |= ME_EDGEDRAW; ed->flag |= ME_EDGEDRAW;
origindex[numEdges * 2 + i] = ORIGINDEX_NONE; *orig_ed = ORIGINDEX_NONE;
if (crease_rim) if (crease_rim) {
ed->crease = crease_rim; ed->crease = crease_rim;
}
} }
/* faces */ /* faces */
edge_origIndex = origindex;
origindex = DM_get_poly_data_layer(result, CD_ORIGINDEX);
mp = mpoly + (numFaces * 2); mp = mpoly + (numFaces * 2);
ml = mloop + (numLoops * 2); ml = mloop + (numLoops * 2);
j = 0; j = 0;
@@ -673,10 +673,8 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
ml[j++].e = numEdges * 2 + old_vert_arr[ed->v2]; ml[j++].e = numEdges * 2 + old_vert_arr[ed->v2];
} }
if (edge_origIndex) { origindex_edge[ml[j - 3].e] = ORIGINDEX_NONE;
edge_origIndex[ml[j - 3].e] = ORIGINDEX_NONE; origindex_edge[ml[j - 1].e] = ORIGINDEX_NONE;
edge_origIndex[ml[j - 1].e] = ORIGINDEX_NONE;
}
/* use the next material index if option enabled */ /* use the next material index if option enabled */
if (mat_ofs_rim) { if (mat_ofs_rim) {