[Bf-blender-cvs] [4b42a49] master: Fix error in bvhtree_walk_dfs_recursive

Germano Cavalcante noreply at git.blender.org
Fri Feb 12 16:01:26 CET 2016


Commit: 4b42a4908633989969f1f266c36c9cbca9fd9a99
Author: Germano Cavalcante
Date:   Sat Feb 13 01:50:08 2016 +1100
Branches: master
https://developer.blender.org/rB4b42a4908633989969f1f266c36c9cbca9fd9a99

Fix error in bvhtree_walk_dfs_recursive

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

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

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

diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c
index 7bd2b50..22862b8 100644
--- a/source/blender/blenlib/intern/BLI_kdopbvh.c
+++ b/source/blender/blenlib/intern/BLI_kdopbvh.c
@@ -2076,7 +2076,7 @@ static bool bvhtree_walk_dfs_recursive(
 		/* First pick the closest node to recurse into */
 		if (walk_order_cb((const BVHTreeAxisRange *)node->bv, node->main_axis, userdata)) {
 			for (int i = 0; i != node->totnode; i++) {
-				if (walk_parent_cb((const BVHTreeAxisRange *)node->bv, userdata)) {
+				if (walk_parent_cb((const BVHTreeAxisRange *)node->children[i]->bv, userdata)) {
 					if (!bvhtree_walk_dfs_recursive(
 					        walk_parent_cb, walk_leaf_cb, walk_order_cb,
 					        node->children[i], userdata))
@@ -2088,7 +2088,7 @@ static bool bvhtree_walk_dfs_recursive(
 		}
 		else {
 			for (int i = node->totnode - 1; i >= 0; i--) {
-				if (walk_parent_cb((const BVHTreeAxisRange *)node->bv, userdata)) {
+				if (walk_parent_cb((const BVHTreeAxisRange *)node->children[i]->bv, userdata)) {
 					if (!bvhtree_walk_dfs_recursive(
 					        walk_parent_cb, walk_leaf_cb, walk_order_cb,
 					        node->children[i], userdata))




More information about the Bf-blender-cvs mailing list