[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43963] branches/bmesh/blender/source/ blender/bmesh: remove BMFlagLayer.index, (saves 4 bytes of memory per vert/ edge/face)

[Campbell Barton]

Revision: 43963
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43963
Author:   campbellbarton
Date:     2012-02-07 17:10:50 +0000 (Tue, 07 Feb 2012)
Log Message:
-----------
remove BMFlagLayer.index, (saves 4 bytes of memory per vert/edge/face)

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/bmesh/bmesh_class.h
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h

Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_class.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_class.h	2012-02-07 16:53:14 UTC (rev 43962)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_class.h	2012-02-07 17:10:50 UTC (rev 43963)
@@ -113,8 +113,7 @@
 } BMFace;
 
 typedef struct BMFlagLayer {
-	short f, pflag; /*flags*/
-	int index; /*generic index*/
+	short f, pflag; /* flags */
 } BMFlagLayer;
 
 typedef struct BMesh {

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c	2012-02-07 16:53:14 UTC (rev 43962)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c	2012-02-07 17:10:50 UTC (rev 43963)
@@ -1510,7 +1510,7 @@
  */
 BMFace *bmesh_jfke(BMesh *bm, BMFace *f1, BMFace *f2, BMEdge *e)
 {
-	BMLoop *curloop, *f1loop = NULL, *f2loop = NULL;
+	BMLoop *l_iter, *f1loop = NULL, *f2loop = NULL;
 	int newlen = 0, i, f1len = 0, f2len = 0, radlen = 0, edok, shared;
 	BMIter iter;
 
@@ -1522,15 +1522,15 @@
 	/* verify that e is in both f1 and f2 */
 	f1len = f1->len;
 	f2len = f2->len;
-	BM_ITER(curloop, &iter, bm, BM_LOOPS_OF_FACE, f1) {
-		if (curloop->e == e) {
-			f1loop = curloop;
+	BM_ITER(l_iter, &iter, bm, BM_LOOPS_OF_FACE, f1) {
+		if (l_iter->e == e) {
+			f1loop = l_iter;
 			break;
 		}
 	}
-	BM_ITER(curloop, &iter, bm, BM_LOOPS_OF_FACE, f2) {
-		if (curloop->e == e) {
-			f2loop = curloop;
+	BM_ITER(l_iter, &iter, bm, BM_LOOPS_OF_FACE, f2) {
+		if (l_iter->e == e) {
+			f2loop = l_iter;
 			break;
 		}
 	}
@@ -1566,22 +1566,22 @@
 	}
 
 	/* validate no internal join */
-	for (i = 0, curloop = BM_FACE_FIRST_LOOP(f1); i < f1len; i++, curloop = curloop->next) {
-		BM_ClearHFlag(curloop->v, BM_TMP_TAG);
+	for (i = 0, l_iter = BM_FACE_FIRST_LOOP(f1); i < f1len; i++, l_iter = l_iter->next) {
+		BM_ClearHFlag(l_iter->v, BM_TMP_TAG);
 	}
-	for (i = 0, curloop = BM_FACE_FIRST_LOOP(f2); i < f2len; i++, curloop = curloop->next) {
-		BM_ClearHFlag(curloop->v, BM_TMP_TAG);
+	for (i = 0, l_iter = BM_FACE_FIRST_LOOP(f2); i < f2len; i++, l_iter = l_iter->next) {
+		BM_ClearHFlag(l_iter->v, BM_TMP_TAG);
 	}
 
-	for (i = 0, curloop = BM_FACE_FIRST_LOOP(f1); i < f1len; i++, curloop = curloop->next) {
-		if (curloop != f1loop) {
-			BM_SetHFlag(curloop->v, BM_TMP_TAG);
+	for (i = 0, l_iter = BM_FACE_FIRST_LOOP(f1); i < f1len; i++, l_iter = l_iter->next) {
+		if (l_iter != f1loop) {
+			BM_SetHFlag(l_iter->v, BM_TMP_TAG);
 		}
 	}
-	for (i = 0, curloop = BM_FACE_FIRST_LOOP(f2); i < f2len; i++, curloop = curloop->next) {
-		if (curloop != f2loop) {
+	for (i = 0, l_iter = BM_FACE_FIRST_LOOP(f2); i < f2len; i++, l_iter = l_iter->next) {
+		if (l_iter != f2loop) {
 			/* as soon as a duplicate is found, bail out */
-			if (BM_TestHFlag(curloop->v, BM_TMP_TAG)) {
+			if (BM_TestHFlag(l_iter->v, BM_TMP_TAG)) {
 				return NULL;
 			}
 		}
@@ -1603,8 +1603,8 @@
 
 	/* make sure each loop points to the proper fac */
 	newlen = f1->len;
-	for (i = 0, curloop = BM_FACE_FIRST_LOOP(f1); i < newlen; i++, curloop = curloop->next)
-		curloop->f = f1;
+	for (i = 0, l_iter = BM_FACE_FIRST_LOOP(f1); i < newlen; i++, l_iter = l_iter->next)
+		l_iter->f = f1;
 	
 	/* remove edge from the disk cycle of its two vertices */
 	bmesh_disk_remove_edge(f1loop->e, f1loop->e->v1);

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h	2012-02-07 16:53:14 UTC (rev 43962)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h	2012-02-07 17:10:50 UTC (rev 43963)
@@ -76,8 +76,6 @@
 #define bmesh_api_setflag(element, f) (((BMHeader*)(element))->flags[0].pflag |= (f))
 #define bmesh_api_getflag(element, f) (((BMHeader*)(element))->flags[0].pflag & (f))
 #define bmesh_api_clearflag(element, f) (((BMHeader*)(element))->flags[0].pflag &= ~(f))
-#define bmesh_api_setindex(element, i) (((BMHeader*)(element))->flags[0].index = (i))
-#define bmesh_api_getindex(element) (((BMHeader*)(element))->flags[0].index + 0)
 
 /* Polygon Utilities ? FIXME... where do these each go? */
 /* newedgeflag sets a flag layer flag, obviously not the header flag. */