[Bf-blender-cvs] [ee5eb2a] master: Missed last commit

Campbell Barton noreply at git.blender.org
Thu May 5 22:29:36 CEST 2016


Commit: ee5eb2a26a1f66d876d876c751d1076e1748ece6
Author: Campbell Barton
Date:   Fri May 6 06:27:42 2016 +1000
Branches: master
https://developer.blender.org/rBee5eb2a26a1f66d876d876c751d1076e1748ece6

Missed last commit

===================================================================

M	source/blender/blenkernel/intern/bvhutils.c

===================================================================

diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c
index 660412d..e2831ae 100644
--- a/source/blender/blenkernel/intern/bvhutils.c
+++ b/source/blender/blenkernel/intern/bvhutils.c
@@ -432,7 +432,7 @@ static BVHTree *bvhtree_from_mesh_verts_create_tree(
 		if (verts_mask) {
 			BLI_assert(IN_RANGE(verts_num_active, 0, verts_num));
 		}
-		else if (!verts_mask) {
+		else {
 			verts_num_active = verts_num;
 		}
 
@@ -841,15 +841,10 @@ static BVHTree *bvhtree_from_editmesh_looptri_create_tree(
 	int i;
 
 	if (looptri_num) {
-		if (looptri_mask && looptri_num_active == -1) {
-			looptri_num_active = 0;
-			for (i = 0; i < looptri_num; i++) {
-				if (BLI_BITMAP_TEST_BOOL(looptri_mask, i)) {
-					looptri_num_active++;
-				}
-			}
+		if (looptri_mask) {
+			BLI_assert(IN_RANGE(looptri_num_active, 0, looptri_num));
 		}
-		else if (!looptri_mask) {
+		else {
 			looptri_num_active = looptri_num;
 		}
 
@@ -896,15 +891,10 @@ static BVHTree *bvhtree_from_mesh_looptri_create_tree(
 	int i;
 
 	if (looptri_num) {
-		if (looptri_mask && looptri_num_active == -1) {
-			looptri_num_active = 0;
-			for (i = 0; i < looptri_num; i++) {
-				if (BLI_BITMAP_TEST_BOOL(looptri_mask, i)) {
-					looptri_num_active++;
-				}
-			}
+		if (looptri_mask) {
+			BLI_assert(IN_RANGE(looptri_num_active, 0, looptri_num));
 		}
-		else if (!looptri_mask) {
+		else {
 			looptri_num_active = looptri_num;
 		}




More information about the Bf-blender-cvs mailing list