archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Missed last commit

Browse Source
This commit is contained in:
Campbell Barton
2016-05-06 06:27:42 +10:00
parent 55c4889864
commit ee5eb2a26a
1 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/blenkernel/intern/bvhutils.c
View File

@@ -432,7 +432,7 @@ static BVHTree *bvhtree_from_mesh_verts_create_tree(
if (verts_mask) { if (verts_mask) {
BLI_assert(IN_RANGE(verts_num_active, 0, verts_num)); BLI_assert(IN_RANGE(verts_num_active, 0, verts_num));
} }
else if (!verts_mask) { else {
verts_num_active = verts_num; verts_num_active = verts_num;
} }
@@ -841,15 +841,10 @@ static BVHTree *bvhtree_from_editmesh_looptri_create_tree(
int i; int i;
if (looptri_num) { if (looptri_num) {
if (looptri_mask && looptri_num_active == -1) { if (looptri_mask) {
looptri_num_active = 0; BLI_assert(IN_RANGE(looptri_num_active, 0, looptri_num));
for (i = 0; i < looptri_num; i++) {
if (BLI_BITMAP_TEST_BOOL(looptri_mask, i)) {
looptri_num_active++;
} }
} else {
}
else if (!looptri_mask) {
looptri_num_active = looptri_num; looptri_num_active = looptri_num;
} }
@@ -896,15 +891,10 @@ static BVHTree *bvhtree_from_mesh_looptri_create_tree(
int i; int i;
if (looptri_num) { if (looptri_num) {
if (looptri_mask && looptri_num_active == -1) { if (looptri_mask) {
looptri_num_active = 0; BLI_assert(IN_RANGE(looptri_num_active, 0, looptri_num));
for (i = 0; i < looptri_num; i++) {
if (BLI_BITMAP_TEST_BOOL(looptri_mask, i)) {
looptri_num_active++;
} }
} else {
}
else if (!looptri_mask) {
looptri_num_active = looptri_num; looptri_num_active = looptri_num;
} }