[Bf-blender-cvs] [f79930989d4] master: Revert "Fix T62210: endless loop in kd tree lookup"

Campbell Barton noreply at git.blender.org
Wed Mar 6 04:54:17 CET 2019


Commit: f79930989d4f0bd04a1d524571cd25ac214020fb
Author: Campbell Barton
Date:   Wed Mar 6 14:29:39 2019 +1100
Branches: master
https://developer.blender.org/rBf79930989d4f0bd04a1d524571cd25ac214020fb

Revert "Fix T62210: endless loop in kd tree lookup"

This reverts commit 301bcf771dec827138412ca6e7a25e2269eb5e9e.

Caused crash entering particle edit mode.

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

M	source/blender/blenlib/intern/BLI_kdtree.c

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

diff --git a/source/blender/blenlib/intern/BLI_kdtree.c b/source/blender/blenlib/intern/BLI_kdtree.c
index 20e30ce669c..4f12bd0a93f 100644
--- a/source/blender/blenlib/intern/BLI_kdtree.c
+++ b/source/blender/blenlib/intern/BLI_kdtree.c
@@ -112,15 +112,10 @@ static uint kdtree_balance(KDTreeNode *nodes, uint totnode, uint axis, const uin
 	float co;
 	uint left, right, median, i, j;
 
-	if (totnode <= 0) {
+	if (totnode <= 0)
 		return KD_NODE_UNSET;
-	}
-	else if (totnode == 1) {
-		node = nodes + ofs;
-		node->left = KD_NODE_UNSET;
-		node->right = KD_NODE_UNSET;
+	else if (totnode == 1)
 		return 0 + ofs;
-	}
 
 	/* quicksort style sorting around median */
 	left = 0;



More information about the Bf-blender-cvs mailing list