blender
/
blender
130
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

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`.
This commit is contained in:
Germano Cavalcante 2020-01-04 00:34:47 -03:00
parent 025d13045a
commit aad09525fb
Notes: blender-bot 2023-02-14 11:20:29 +01:00 
Referenced by issue #72894, Mantaflow: several crashes due to null pointers.
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

@ -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);
}