godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #57561 from lawnjelly/bvh_fix_leaf_leak

Browse Source
This commit is contained in:
Rémi Verschelde 2022-02-03 09:57:01 +01:00 committed by GitHub
commit ae948d83b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/math/bvh_tree.h
View File

@ -262,7 +262,7 @@ private:
change_root_node(sibling_id, p_tree_id); change_root_node(sibling_id, p_tree_id);
// delete the old root node as no longer needed // delete the old root node as no longer needed
_nodes.free(p_parent_id); node_free_node_and_leaf(p_parent_id);
} }
return; return;
@ -275,7 +275,19 @@ private:
} }
// put the node on the free list to recycle // put the node on the free list to recycle
_nodes.free(p_parent_id); node_free_node_and_leaf(p_parent_id);
}
// A node can either be a node, or a node AND a leaf combo.
// Both must be deleted to prevent a leak.
void node_free_node_and_leaf(uint32_t p_node_id) {
TNode &node = _nodes[p_node_id];
if (node.is_leaf()) {
int leaf_id = node.get_leaf_id();
_leaves.free(leaf_id);
}
_nodes.free(p_node_id);
} }
void change_root_node(uint32_t p_new_root_id, uint32_t p_tree_id) { void change_root_node(uint32_t p_new_root_id, uint32_t p_tree_id) {
@ -367,7 +379,7 @@ private:
refit_upward(parent_id); refit_upward(parent_id);
// put the node on the free list to recycle // put the node on the free list to recycle
_nodes.free(owner_node_id); node_free_node_and_leaf(owner_node_id);
} }
// else if no parent, it is the root node. Do not delete // else if no parent, it is the root node. Do not delete