From a1e95e2e1818ffc88aa5079916b1ee51c1e585f0 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 1 Nov 2011 12:51:38 +0000 Subject: replace as many uses of BM_Get/SetIndex as possible with tagging with a temp flag, some uses need index values to be set, so this will need more effort to replace (crazy space and solidify for eg). --- source/blender/editors/uvedit/uvedit_draw.c | 38 ++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'source/blender/editors/uvedit/uvedit_draw.c') diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c index 1d56740f91e..048bb17b183 100644 --- a/source/blender/editors/uvedit/uvedit_draw.c +++ b/source/blender/editors/uvedit/uvedit_draw.c @@ -207,12 +207,12 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe totuvarea += poly_uv_area(tf_uv, efa->len); if(uvedit_face_visible(scene, ima, efa, tf)) { - BM_SetIndex(efa, 1); + BM_SetHFlag(efa, BM_TMP_TAG); } else { if(tf == activetf) activetf= NULL; - BM_SetIndex(efa, 0); + BM_ClearHFlag(efa, BM_TMP_TAG); } } @@ -221,7 +221,7 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe col[1] = col[2] = 0.0; glColor3fv(col); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if(BM_GetIndex(efa)) { + if(BM_TestHFlag(efa, BM_TMP_TAG)) { glBegin(GL_POLYGON); BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); @@ -233,7 +233,7 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe } else { BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if(BM_GetIndex(efa)) { + if(BM_TestHFlag(efa, BM_TMP_TAG)) { area = BM_face_area(efa) / totarea; BLI_array_empty(tf_uv); @@ -535,7 +535,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) tf= CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if(uvedit_face_visible(scene, ima, efa, tf)) { - BM_SetIndex(efa, 1); + BM_SetHFlag(efa, BM_TMP_TAG); if(tf==activetf) continue; /* important the temp boolean is set above */ if(uvedit_face_selected(scene, em, efa)) @@ -553,7 +553,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) else { if(tf == activetf) activetf= NULL; - BM_SetIndex(efa, 0); + BM_ClearHFlag(efa, BM_TMP_TAG); } } glDisable(GL_BLEND); @@ -565,12 +565,12 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) tf= CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if(uvedit_face_visible(scene, ima, efa, tf)) { - BM_SetIndex(efa, 1); + BM_SetHFlag(efa, BM_TMP_TAG); } else { if(tf == activetf) activetf= NULL; - BM_SetIndex(efa, 0); + BM_ClearHFlag(efa, BM_TMP_TAG); } } @@ -608,7 +608,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) switch(sima->dt_uv) { case SI_UVDT_DASH: BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_GetIndex(efa)) + if (!BM_TestHFlag(efa, BM_TMP_TAG)) continue; tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); @@ -649,7 +649,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) else glColor3f(0.0f, 0.0f, 0.0f); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_GetIndex(efa)) + if (!BM_TestHFlag(efa, BM_TMP_TAG)) continue; glBegin(GL_LINE_LOOP); @@ -665,7 +665,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) cpack(0x0); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_GetIndex(efa)) + if (!BM_TestHFlag(efa, BM_TMP_TAG)) continue; glBegin(GL_LINE_LOOP); @@ -688,7 +688,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) glShadeModel(GL_SMOOTH); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_GetIndex(efa)) + if (!BM_TestHFlag(efa, BM_TMP_TAG)) continue; glBegin(GL_LINE_LOOP); @@ -706,7 +706,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) } else { BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_GetIndex(efa)) + if (!BM_TestHFlag(efa, BM_TMP_TAG)) continue; glBegin(GL_LINES); @@ -728,7 +728,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) else { /* no nice edges */ BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_GetIndex(efa)) + if (!BM_TestHFlag(efa, BM_TMP_TAG)) continue; glBegin(GL_LINE_LOOP); @@ -761,7 +761,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) bglBegin(GL_POINTS); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_GetIndex(efa)) + if (!BM_TestHFlag(efa, BM_TMP_TAG)) continue; if(!uvedit_face_selected(scene, em, efa)) { @@ -776,7 +776,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) bglBegin(GL_POINTS); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_GetIndex(efa)) + if (!BM_TestHFlag(efa, BM_TMP_TAG)) continue; if(uvedit_face_selected(scene, em, efa)) { @@ -797,7 +797,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) bglBegin(GL_POINTS); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_GetIndex(efa)) + if (!BM_TestHFlag(efa, BM_TMP_TAG)) continue; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { @@ -815,7 +815,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) bglBegin(GL_POINTS); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_GetIndex(efa)) + if (!BM_TestHFlag(efa, BM_TMP_TAG)) continue; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { @@ -833,7 +833,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) bglBegin(GL_POINTS); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_GetIndex(efa)) + if (!BM_TestHFlag(efa, BM_TMP_TAG)) continue; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { -- cgit v1.2.3