[Bf-blender-cvs] [aad09525fb5] master: BLI_bvhtree_overlap: Fix wrong count of child nodes
mano-wii
noreply at git.blender.org
Sat Jan 4 04:35:07 CET 2020
Commit: aad09525fb554ed023419d1c4fd12a5b8da72660
Author: mano-wii
Date: Sat Jan 4 00:34:47 2020 -0300
Branches: master
https://developer.blender.org/rBaad09525fb554ed023419d1c4fd12a5b8da72660
BLI_bvhtree_overlap: Fix wrong count of child nodes
As you can see, here is testing the "children" of `node1`.
So bvhtree is `tree1`.
This problem has never been observed because usually `tree_type`
of `tree1` equals `tree_type` of `tree2`.
===================================================================
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 2674e6c61dc..7ac4a362cf4 100644
--- a/source/blender/blenlib/intern/BLI_kdopbvh.c
+++ b/source/blender/blenlib/intern/BLI_kdopbvh.c
@@ -1129,7 +1129,7 @@ static void tree_overlap_traverse(BVHOverlapData_Thread *data_thread,
}
}
else {
- for (j = 0; j < data->tree2->tree_type; j++) {
+ for (j = 0; j < data->tree1->tree_type; j++) {
if (node1->children[j]) {
tree_overlap_traverse(data_thread, node1->children[j], node2);
}
@@ -1176,7 +1176,7 @@ static void tree_overlap_traverse_cb(BVHOverlapData_Thread *data_thread,
}
}
else {
- for (j = 0; j < data->tree2->tree_type; j++) {
+ for (j = 0; j < data->tree1->tree_type; j++) {
if (node1->children[j]) {
tree_overlap_traverse_cb(data_thread, node1->children[j], node2);
}
More information about the Bf-blender-cvs
mailing list