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>2016-05-05 22:40:07 +0300
committerCampbell Barton <ideasman42@gmail.com>2016-05-05 22:40:07 +0300
commit7122b05ac30d2c1d0854683c82c21b32633cb2b1 (patch)
tree922b24a2f2bb17f9cfef6f91052a1cdb95d6a5e5 /source/blender/bmesh/intern/bmesh_iterators.c
parent46ccc54faf8257780dbd8f5d36abc1419ad5576c (diff)
Correct own mistake int recent transform API edits
Need to return number of enabled elements.
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_iterators.c')
-rw-r--r--source/blender/bmesh/intern/bmesh_iterators.c25
1 files changed, 16 insertions, 9 deletions
diff --git a/source/blender/bmesh/intern/bmesh_iterators.c b/source/blender/bmesh/intern/bmesh_iterators.c
index 1ee629d203b..a484c1bf749 100644
--- a/source/blender/bmesh/intern/bmesh_iterators.c
+++ b/source/blender/bmesh/intern/bmesh_iterators.c
@@ -260,9 +260,16 @@ int BM_iter_mesh_bitmap_from_filter(
BMIter iter;
BMElem *ele;
int i;
+ int bitmap_enabled = 0;
BM_ITER_MESH_INDEX (ele, &iter, bm, itype, i) {
- BLI_BITMAP_SET(bitmap, i, test_fn(ele, user_data));
+ if (test_fn(ele, user_data)) {
+ BLI_BITMAP_ENABLE(bitmap, i);
+ bitmap_enabled++;
+ }
+ else {
+ BLI_BITMAP_DISABLE(bitmap, i);
+ }
}
return i;
@@ -280,24 +287,24 @@ int BM_iter_mesh_bitmap_from_filter_tessface(
BMIter iter;
BMFace *f;
int i;
- int j = 0;
+ int bitmap_enabled = 0;
BM_ITER_MESH_INDEX (f, &iter, bm, BM_FACES_OF_MESH, i) {
if (test_fn(f, user_data)) {
- for (int A = 2; A < f->len; A++) {
- BLI_BITMAP_ENABLE(bitmap, j);
- j++;
+ for (int tri = 2; tri < f->len; tri++) {
+ BLI_BITMAP_ENABLE(bitmap, bitmap_enabled);
+ bitmap_enabled++;
}
}
else {
- for (int A = 2; A < f->len; A++) {
- BLI_BITMAP_DISABLE(bitmap, j);
- j++;
+ for (int tri = 2; tri < f->len; tri++) {
+ BLI_BITMAP_DISABLE(bitmap, bitmap_enabled);
+ bitmap_enabled++;
}
}
}
- return j;
+ return bitmap_enabled;
}
/**