[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44998] trunk/blender/source/blender: style cleanup: minor change to bmesh py repr + comment on loop radial next /prev to avoid confusion.

Campbell Barton ideasman42 at gmail.com
Mon Mar 19 21:02:00 CET 2012


Revision: 44998
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44998
Author:   campbellbarton
Date:     2012-03-19 20:01:59 +0000 (Mon, 19 Mar 2012)
Log Message:
-----------
style cleanup: minor change to bmesh py repr + comment on loop radial next/prev to avoid confusion.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/bmesh_class.h
    trunk/blender/source/blender/python/bmesh/bmesh_py_types.c

Modified: trunk/blender/source/blender/bmesh/bmesh_class.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh_class.h	2012-03-19 19:27:39 UTC (rev 44997)
+++ trunk/blender/source/blender/bmesh/bmesh_class.h	2012-03-19 20:01:59 UTC (rev 44998)
@@ -110,6 +110,8 @@
 	struct BMEdge *e; /* edge, using verts (v, next->v) */
 	struct BMFace *f;
 
+	/* circular linked list of loops which all use the same edge as this one '->e',
+	 * but not necessarily the same vertex (can be either v1 or v2 of our own '->e') */
 	struct BMLoop *radial_next, *radial_prev;
 
 	/* these were originally commented as private but are used all over the code */

Modified: trunk/blender/source/blender/python/bmesh/bmesh_py_types.c
===================================================================
--- trunk/blender/source/blender/python/bmesh/bmesh_py_types.c	2012-03-19 19:27:39 UTC (rev 44997)
+++ trunk/blender/source/blender/python/bmesh/bmesh_py_types.c	2012-03-19 20:01:59 UTC (rev 44998)
@@ -2519,8 +2519,9 @@
 	BMesh *bm = self->bm;
 
 	if (bm) {
+		BMVert *v = self->v;
 		return PyUnicode_FromFormat("<BMVert(%p), index=%d>",
-		                            self->v, BM_elem_index_get(self->v));
+		                            v, BM_elem_index_get(v));
 	}
 	else {
 		return PyUnicode_FromFormat("<BMVert dead at %p>", self);
@@ -2532,10 +2533,11 @@
 	BMesh *bm = self->bm;
 
 	if (bm) {
+		BMEdge *e = self->e;
 		return PyUnicode_FromFormat("<BMEdge(%p), index=%d, verts=(%p/%d, %p/%d)>",
-		                            self->e, BM_elem_index_get(self->e),
-		                            self->e->v1, BM_elem_index_get(self->e->v1),
-		                            self->e->v2, BM_elem_index_get(self->e->v2));
+		                            e, BM_elem_index_get(e),
+		                            e->v1, BM_elem_index_get(e->v1),
+		                            e->v2, BM_elem_index_get(e->v2));
 	}
 	else {
 		return PyUnicode_FromFormat("<BMEdge dead at %p>", self);
@@ -2547,9 +2549,10 @@
 	BMesh *bm = self->bm;
 
 	if (bm) {
+		BMFace *f = self->f;
 		return PyUnicode_FromFormat("<BMFace(%p), index=%d, totverts=%d>",
-		                            self->f, BM_elem_index_get(self->f),
-		                            self->f->len);
+		                            f, BM_elem_index_get(f),
+		                            f->len);
 	}
 	else {
 		return PyUnicode_FromFormat("<BMFace dead at %p>", self);
@@ -2561,11 +2564,12 @@
 	BMesh *bm = self->bm;
 
 	if (bm) {
+		BMLoop *l = self->l;
 		return PyUnicode_FromFormat("<BMLoop(%p), index=%d, vert=%p/%d, edge=%p/%d, face=%p/%d>",
-		                            self->l, BM_elem_index_get(self->l),
-		                            self->l->v, BM_elem_index_get(self->l->v),
-		                            self->l->e, BM_elem_index_get(self->l->e),
-		                            self->l->f, BM_elem_index_get(self->l->f));
+		                            l, BM_elem_index_get(l),
+		                            l->v, BM_elem_index_get(l->v),
+		                            l->e, BM_elem_index_get(l->e),
+		                            l->f, BM_elem_index_get(l->f));
 	}
 	else {
 		return PyUnicode_FromFormat("<BMLoop dead at %p>", self);




More information about the Bf-blender-cvs mailing list