[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42909] trunk/blender/source/blender/ modifiers/intern/MOD_solidify.c: sync some edits with bmesh

Campbell Barton ideasman42 at gmail.com
Wed Dec 28 08:43:15 CET 2011


Revision: 42909
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42909
Author:   campbellbarton
Date:     2011-12-28 07:43:06 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
sync some edits with bmesh

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	2011-12-28 07:10:27 UTC (rev 42908)
+++ trunk/blender/source/blender/modifiers/intern/MOD_solidify.c	2011-12-28 07:43:06 UTC (rev 42909)
@@ -100,15 +100,21 @@
 
 		/* This function adds an edge hash if its not there, and adds the face index */
 #define NOCALC_EDGEWEIGHT_ADD_EDGEREF_FACE(EDV1, EDV2); \
-				edge_ref = (EdgeFaceRef *)BLI_edgehash_lookup(edge_hash, EDV1, EDV2); \
+			{ \
+				const unsigned int ed_v1 = EDV1; \
+				const unsigned int ed_v2 = EDV2; \
+				edge_ref = (EdgeFaceRef *)BLI_edgehash_lookup(edge_hash, ed_v1, ed_v2); \
 				if (!edge_ref) { \
 					edge_ref = &edge_ref_array[edge_ref_count]; edge_ref_count++; \
-					edge_ref->f1=i; \
-					edge_ref->f2=-1; \
-					BLI_edgehash_insert(edge_hash, EDV1, EDV2, edge_ref); \
-				} else { \
+					edge_ref->f1 = i; \
+					edge_ref->f2 =- 1; \
+					BLI_edgehash_insert(edge_hash, ed_v1, ed_v2, edge_ref); \
+				} \
+				else { \
 					edge_ref->f2=i; \
-				}
+				} \
+			}
+		/* --- end define --- */
 
 		for(i = 0; i < numFaces; i++, mf++) {
 			f_no = face_nors[i];
@@ -265,14 +271,19 @@
 #define INVALID_PAIR -2
 
 #define ADD_EDGE_USER(_v1, _v2, edge_ord) \
-		eidx= GET_INT_FROM_POINTER(BLI_edgehash_lookup(edgehash, _v1, _v2)); \
-		if(edge_users[eidx] == INVALID_UNUSED) { \
-			ed= orig_medge + eidx; \
-			edge_users[eidx]= (_v1 < _v2) == (ed->v1 < ed->v2) ? i:(i+numFaces); \
-			edge_order[eidx]= edge_ord; \
-		} else { \
-			edge_users[eidx]= INVALID_PAIR; \
-		} \
+		{ \
+			const unsigned int ml_v1 = _v1; \
+			const unsigned int ml_v2 = _v2; \
+			eidx= GET_INT_FROM_POINTER(BLI_edgehash_lookup(edgehash, ml_v1, ml_v2)); \
+			if(edge_users[eidx] == INVALID_UNUSED) { \
+				ed= orig_medge + eidx; \
+				edge_users[eidx] = (ml_v1 < ml_v2) == (ed->v1 < ed->v2) ? i : (i + numFaces); \
+				edge_order[eidx] = edge_ord; \
+			} \
+			else { \
+				edge_users[eidx] = INVALID_PAIR; \
+			} \
+		}
 
 
 		edge_users= MEM_mallocN(sizeof(int) * numEdges, "solid_mod edges");




More information about the Bf-blender-cvs mailing list