[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46924] trunk/blender/source/blender/ modifiers/intern/MOD_solidify.c: fix solidify modifier flipping of rim polygons.

Campbell Barton ideasman42 at gmail.com
Wed May 23 08:25:31 CEST 2012


Revision: 46924
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46924
Author:   campbellbarton
Date:     2012-05-23 06:25:31 +0000 (Wed, 23 May 2012)
Log Message:
-----------
fix solidify modifier flipping of rim polygons.

Modified Paths:
--------------
    trunk/blender/source/blender/modifiers/intern/MOD_solidify.c

Modified: trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_solidify.c	2012-05-23 04:15:50 UTC (rev 46923)
+++ trunk/blender/source/blender/modifiers/intern/MOD_solidify.c	2012-05-23 06:25:31 UTC (rev 46924)
@@ -32,7 +32,6 @@
  *  \ingroup modifiers
  */
 
-
 #include "DNA_meshdata_types.h"
 
 #include "MEM_guardedalloc.h"
@@ -51,7 +50,6 @@
 #include "MOD_modifiertypes.h"
 #include "MOD_util.h"
 
-
 typedef struct EdgeFaceRef {
 	int f1; /* init as -1 */
 	int f2;
@@ -168,7 +166,7 @@
 		}
 	}
 }
- 
+
 static void initData(ModifierData *md)
 {
 	SolidifyModifierData *smd = (SolidifyModifierData *) md;
@@ -176,7 +174,7 @@
 	smd->offset_fac = -1.0f;
 	smd->flag = MOD_SOLIDIFY_RIM;
 }
- 
+
 static void copyData(ModifierData *md, ModifierData *target)
 {
 	SolidifyModifierData *smd = (SolidifyModifierData *) md;
@@ -366,7 +364,7 @@
 	/* if the original has it, get the result so we can update it */
 	face_nors_result = CustomData_get_layer(&result->polyData, CD_NORMAL);
 
-	/*flip normals*/
+	/* flip normals */
 	mp = mpoly + numFaces;
 	for (i = 0; i < dm->numPolyData; i++, mp++) {
 		MLoop *ml2;
@@ -614,10 +612,10 @@
 
 			if (fidx >= numFaces) {
 				fidx -= numFaces;
-				flip = 1;
+				flip = TRUE;
 			}
 			else {
-				flip = 0;
+				flip = FALSE;
 			}
 
 			ed = medge + eidx;
@@ -640,7 +638,7 @@
 			CustomData_copy_data(&dm->loopData, &result->loopData, k2, numLoops * 2 + j + 2, 1);
 			CustomData_copy_data(&dm->loopData, &result->loopData, k1, numLoops * 2 + j + 3, 1);
 
-			if (flip) {
+			if (flip == FALSE) {
 				ml[j].v = ed->v1;
 				ml[j++].e = eidx;
 				
@@ -782,7 +780,7 @@
 	/* isDisabled */        NULL,
 	/* updateDepgraph */    NULL,
 	/* dependsOnTime */     NULL,
-	/* dependsOnNormals */	NULL,
+	/* dependsOnNormals */  NULL,
 	/* foreachObjectLink */ NULL,
 	/* foreachIDLink */     NULL,
 	/* foreachTexLink */    NULL,




More information about the Bf-blender-cvs mailing list