Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-03-18 13:21:24 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-03-18 13:21:24 +0400
commit1fa0b86c28cc24955ef04888d430b9099372d0df (patch)
tree68b14c51f3d450eecd53b9711bce3cc19ef1f611
parent4f19c1a995de507044d1b5ada7fb7398cdb32096 (diff)
fix for own mistake when refactoring bmesh - was treating the iterator as a type flag.
-rw-r--r--source/blender/bmesh/intern/bmesh_marking.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/bmesh/intern/bmesh_marking.c b/source/blender/bmesh/intern/bmesh_marking.c
index a8840cf8938..453cabd2e2f 100644
--- a/source/blender/bmesh/intern/bmesh_marking.c
+++ b/source/blender/bmesh/intern/bmesh_marking.c
@@ -755,6 +755,9 @@ void BM_mesh_elem_flag_disable_all(BMesh *bm, const char htype, const char hflag
const char iter_types[3] = {BM_VERTS_OF_MESH,
BM_EDGES_OF_MESH,
BM_FACES_OF_MESH};
+
+ const char flag_types[3] = {BM_VERT, BM_EDGE, BM_FACE};
+
BMIter iter;
BMElem *ele;
int i;
@@ -776,7 +779,7 @@ void BM_mesh_elem_flag_disable_all(BMesh *bm, const char htype, const char hflag
}
else {
for (i = 0; i < 3; i++) {
- if (htype & iter_types[i]) {
+ if (htype & flag_types[i]) {
ele = BM_iter_new(&iter, bm, iter_types[i], NULL);
for ( ; ele; ele = BM_iter_step(&iter)) {
if (hflag & BM_ELEM_SELECT) {
@@ -794,6 +797,9 @@ void BM_mesh_elem_flag_enable_all(BMesh *bm, const char htype, const char hflag)
const char iter_types[3] = {BM_VERTS_OF_MESH,
BM_EDGES_OF_MESH,
BM_FACES_OF_MESH};
+
+ const char flag_types[3] = {BM_VERT, BM_EDGE, BM_FACE};
+
BMIter iter;
BMElem *ele;
int i;
@@ -807,7 +813,7 @@ void BM_mesh_elem_flag_enable_all(BMesh *bm, const char htype, const char hflag)
* we could ofcourse check for no hiddent faces and then use quicker method but its not worth it. */
for (i = 0; i < 3; i++) {
- if (htype & iter_types[i]) {
+ if (htype & flag_types[i]) {
ele = BM_iter_new(&iter, bm, iter_types[i], NULL);
for ( ; ele; ele = BM_iter_step(&iter)) {
if (hflag & BM_ELEM_SELECT) {