svn merge ^/trunk/blender -r46380:HEAD
[blender-staging.git] / source / blender / modifiers / intern / MOD_solidify.c
index b45304a315fd8084063f2220f8f6a50f0187dd98..e3e873deabd12ff3da8010f84892ee4ec896dce0 100644 (file)
@@ -650,13 +650,13 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
                                ml[j].v = ed->v1 + numVerts;
                                ml[j++].e = eidx + numEdges;
 
-                               ml[j].v = ed->v2 + numVerts;
-                               ml[j++].e = numEdges * 2 + old_vert_arr[ed->v2];
+                               ml[j].v = ed->v2+numVerts;
+                               ml[j++].e = numEdges*2 + old_vert_arr[ed->v2];
                        }
                        
                        if (edge_origIndex) {
-                               edge_origIndex[ml[j - 3].e] = ORIGINDEX_NONE;
-                               edge_origIndex[ml[j - 1].e] = ORIGINDEX_NONE;
+                               edge_origIndex[ml[j-3].e] = ORIGINDEX_NONE;
+                               edge_origIndex[ml[j-1].e] = ORIGINDEX_NONE;
                        }
 
                        /* use the next material index if option enabled */
@@ -673,9 +673,9 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 
                        if (crease_inner) {
                                /* crease += crease_inner; without wrapping */
-                               unsigned char *cr = (unsigned char *)&(medge[numEdges + eidx].crease);
-                               int tcr = *cr + crease_inner;
-                               *cr = tcr > 255 ? 255 : tcr;
+                               unsigned char *cr= (unsigned char *)&(medge[numEdges + eidx].crease);
+                               int tcr= *cr + crease_inner;
+                               *cr= tcr > 255 ? 255 : tcr;
                        }
                        
 #ifdef SOLIDIFY_SIDE_NORMALS