[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42500] branches/bmesh/blender/source/ blender: rename iterator type from htype to itype ( htype means header type for BMesh elements)
Campbell Barton
ideasman42 at gmail.com
Wed Dec 7 21:55:32 CET 2011
Revision: 42500
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42500
Author: campbellbarton
Date: 2011-12-07 20:55:28 +0000 (Wed, 07 Dec 2011)
Log Message:
-----------
rename iterator type from htype to itype (htype means header type for BMesh elements)
Modified Paths:
--------------
branches/bmesh/blender/source/blender/bmesh/bmesh_iterators.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators_inline.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_iterators.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_iterators.h 2011-12-07 20:27:50 UTC (rev 42499)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_iterators.h 2011-12-07 20:55:28 UTC (rev 42500)
@@ -47,12 +47,12 @@
#define BM_LOOPS_OF_LOOP 12
#define BM_LOOPS_OF_EDGE 13
-#define BM_ITER(ele, iter, bm, type, data) \
- ele = BMIter_New(iter, bm, type, data); \
+#define BM_ITER(ele, iter, bm, itype, data) \
+ ele = BMIter_New(iter, bm, itype, data); \
for ( ; ele; ele=BMIter_Step(iter))
-#define BM_ITER_INDEX(ele, iter, bm, type, data, indexvar) \
- ele = BMIter_New(iter, bm, type, data); \
+#define BM_ITER_INDEX(ele, iter, bm, itype, data, indexvar) \
+ ele = BMIter_New(iter, bm, itype, data); \
for (indexvar=0; ele; indexvar++, ele=BMIter_Step(iter))
/*Iterator Structure*/
@@ -66,14 +66,15 @@
struct BMesh *bm;
void (*begin)(struct BMIter *iter);
void *(*step)(struct BMIter *iter);
- union{
- void *p;
- int i;
- long l;
- float f;
+ union {
+ void *p;
+ int i;
+ long l;
+ float f;
} filter;
- int htype, count;
-}BMIter;
+ int count;
+ char itype;
+} BMIter;
void *BMIter_AtIndex(struct BMesh *bm, const char htype, void *data, int index);
int BMIter_AsArray(struct BMesh *bm, const char htype, void *data, void **array, const int len);
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators.c 2011-12-07 20:27:50 UTC (rev 42499)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators.c 2011-12-07 20:55:28 UTC (rev 42500)
@@ -36,7 +36,7 @@
/*
* note, we have BM_Vert_AtIndex/BM_Edge_AtIndex/BM_Face_AtIndex for arrays
*/
-void *BMIter_AtIndex(struct BMesh *bm, const char htype, void *data, int index)
+void *BMIter_AtIndex(struct BMesh *bm, const char itype, void *data, int index)
{
BMIter iter;
void *val;
@@ -45,7 +45,7 @@
/*sanity check*/
if (index < 0) return NULL;
- val=BMIter_New(&iter, bm, htype, data);
+ val=BMIter_New(&iter, bm, itype, data);
i = 0;
while (i < index) {
@@ -64,7 +64,7 @@
* to avoid multiple calls to BMIter_AtIndex.
*/
-int BMIter_AsArray(struct BMesh *bm, const char htype, void *data, void **array, const int len)
+int BMIter_AsArray(struct BMesh *bm, const char type, void *data, void **array, const int len)
{
int i= 0;
@@ -74,7 +74,7 @@
BMIter iter;
void *val;
- BM_ITER(val, &iter, bm, htype, data) {
+ BM_ITER(val, &iter, bm, type, data) {
array[i]= val;
i++;
if (i == len) {
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators_inline.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators_inline.c 2011-12-07 20:27:50 UTC (rev 42499)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators_inline.c 2011-12-07 20:55:28 UTC (rev 42500)
@@ -60,14 +60,14 @@
* to return the first element of the iterator.
*
*/
-BM_INLINE void *BMIter_New(BMIter *iter, BMesh *bm, const char htype, void *data)
+BM_INLINE void *BMIter_New(BMIter *iter, BMesh *bm, const char itype, void *data)
{
/* int argtype; */
- iter->htype = htype;
+ iter->itype = itype;
iter->bm = bm;
/* inlining optimizes out this switch when called with the defined type */
- switch(htype){
+ switch(itype){
case BM_VERTS_OF_MESH:
iter->begin = bmiter__vert_of_mesh_begin;
iter->step = bmiter__vert_of_mesh_step;
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c 2011-12-07 20:27:50 UTC (rev 42499)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c 2011-12-07 20:55:28 UTC (rev 42500)
@@ -59,7 +59,7 @@
{
BMIter iter;
BMHeader *ele;
- int types[3] = {BM_VERTS_OF_MESH, BM_EDGES_OF_MESH, BM_FACES_OF_MESH};
+ const char itypes[3] = {BM_VERTS_OF_MESH, BM_EDGES_OF_MESH, BM_FACES_OF_MESH};
int *tots[3];
int i;
@@ -70,7 +70,7 @@
tots[2] = &bm->totfacesel;
for (i=0; i<3; i++) {
- ele = BMIter_New(&iter, bm, types[i], NULL);
+ ele = BMIter_New(&iter, bm, itypes[i], NULL);
for ( ; ele; ele=BMIter_Step(&iter)) {
if (BM_TestHFlag(ele, BM_SELECT)) *tots[i] += 1;
}
@@ -637,7 +637,7 @@
void BM_clear_flag_all(BMesh *bm, const char hflag)
{
- int types[3] = {BM_VERTS_OF_MESH, BM_EDGES_OF_MESH, BM_FACES_OF_MESH};
+ const char itypes[3] = {BM_VERTS_OF_MESH, BM_EDGES_OF_MESH, BM_FACES_OF_MESH};
BMIter iter;
BMHeader *ele;
int i;
@@ -646,7 +646,7 @@
BM_clear_selection_history(bm);
for (i=0; i<3; i++) {
- ele = BMIter_New(&iter, bm, types[i], NULL);
+ ele = BMIter_New(&iter, bm, itypes[i], NULL);
for ( ; ele; ele=BMIter_Step(&iter)) {
if (hflag & BM_SELECT) BM_Select(bm, ele, 0);
BM_ClearHFlag(ele, hflag);
Modified: branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c 2011-12-07 20:27:50 UTC (rev 42499)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c 2011-12-07 20:55:28 UTC (rev 42500)
@@ -121,7 +121,7 @@
{
BMIter iter;
BMHeader *ele;
- int types[3] = {BM_VERTS_OF_MESH, BM_EDGES_OF_MESH, BM_FACES_OF_MESH};
+ const char itypes[3] = {BM_VERTS_OF_MESH, BM_EDGES_OF_MESH, BM_FACES_OF_MESH};
int *tots[3];
int i;
@@ -132,7 +132,7 @@
em->bm->totvertsel = em->bm->totedgesel = em->bm->totfacesel = 0;
for (i=0; i<3; i++) {
- ele = BMIter_New(&iter, em->bm, types[i], NULL);
+ ele = BMIter_New(&iter, em->bm, itypes[i], NULL);
for ( ; ele; ele=BMIter_Step(&iter)) {
if (BM_TestHFlag(ele, BM_SELECT)) {
(*tots[i])++;
@@ -509,13 +509,13 @@
void EDBM_set_flag_all(BMEditMesh *em, const char hflag)
{
- int types[3] = {BM_VERTS_OF_MESH, BM_EDGES_OF_MESH, BM_FACES_OF_MESH};
+ const char itypes[3] = {BM_VERTS_OF_MESH, BM_EDGES_OF_MESH, BM_FACES_OF_MESH};
BMIter iter;
BMHeader *ele;
int i;
for (i=0; i<3; i++) {
- ele= BMIter_New(&iter, em->bm, types[i], NULL);
+ ele= BMIter_New(&iter, em->bm, itypes[i], NULL);
for ( ; ele; ele=BMIter_Step(&iter)) {
if (hflag & BM_SELECT) {
BM_Select(em->bm, ele, 1);
More information about the Bf-blender-cvs
mailing list