sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix error in bvhtree_walk_dfs_recursive

Browse Source
This commit is contained in:
Germano Cavalcante 2016-02-13 01:50:08 +11:00 committed by Campbell Barton
parent c8d2bc7890
commit 4b42a49086
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenlib/intern/BLI_kdopbvh.c
View File

@ -2076,7 +2076,7 @@ static bool bvhtree_walk_dfs_recursive(
/* First pick the closest node to recurse into */ /* First pick the closest node to recurse into */
if (walk_order_cb((const BVHTreeAxisRange *)node->bv, node->main_axis, userdata)) { if (walk_order_cb((const BVHTreeAxisRange *)node->bv, node->main_axis, userdata)) {
for (int i = 0; i != node->totnode; i++) { 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( if (!bvhtree_walk_dfs_recursive(
walk_parent_cb, walk_leaf_cb, walk_order_cb, walk_parent_cb, walk_leaf_cb, walk_order_cb,
node->children[i], userdata)) node->children[i], userdata))
@ -2088,7 +2088,7 @@ static bool bvhtree_walk_dfs_recursive(
} }
else { else {
for (int i = node->totnode - 1; i >= 0; i--) { 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( if (!bvhtree_walk_dfs_recursive(
walk_parent_cb, walk_leaf_cb, walk_order_cb, walk_parent_cb, walk_leaf_cb, walk_order_cb,
node->children[i], userdata)) node->children[i], userdata))