Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Correct own mistake int recent transform API edits

Browse Source 
Need to return number of enabled elements.
This commit is contained in:
Campbell Barton
2016-05-06 05:40:07 +10:00
parent 46ccc54faf
commit 7122b05ac3
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
source/blender/bmesh/intern/bmesh_iterators.c
View File

@@ -260,9 +260,16 @@ int BM_iter_mesh_bitmap_from_filter(
BMIter iter; BMIter iter;
BMElem *ele; BMElem *ele;
int i; int i;
int bitmap_enabled = 0;
BM_ITER_MESH_INDEX (ele, &iter, bm, itype, i) { 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; return i;
@@ -280,24 +287,24 @@ int BM_iter_mesh_bitmap_from_filter_tessface(
BMIter iter; BMIter iter;
BMFace *f; BMFace *f;
int i; int i;
int j = 0; int bitmap_enabled = 0;
BM_ITER_MESH_INDEX (f, &iter, bm, BM_FACES_OF_MESH, i) { BM_ITER_MESH_INDEX (f, &iter, bm, BM_FACES_OF_MESH, i) {
if (test_fn(f, user_data)) { if (test_fn(f, user_data)) {
for (int A = 2; A < f->len; A++) { for (int tri = 2; tri < f->len; tri++) {
BLI_BITMAP_ENABLE(bitmap, j); BLI_BITMAP_ENABLE(bitmap, bitmap_enabled);
j++; bitmap_enabled++;
} }
} }
else { else {
for (int A = 2; A < f->len; A++) { for (int tri = 2; tri < f->len; tri++) {
BLI_BITMAP_DISABLE(bitmap, j); BLI_BITMAP_DISABLE(bitmap, bitmap_enabled);
j++; bitmap_enabled++;
} }
} }
} }
return j; return bitmap_enabled;
} }
/** /**