Merge branch 'blender-v4.2-release'

This commit is contained in:
Sergey Sharybin 2024-06-20 17:07:28 +02:00
commit 09394c5445

@ -116,10 +116,6 @@ void IDNode::destroy()
return;
}
for (ComponentNode *comp_node : components.values()) {
delete comp_node;
}
/* Free memory used by this evaluated ID. */
if (!ELEM(id_cow, id_orig, nullptr)) {
deg_free_eval_copy_datablock(id_cow);
@ -129,6 +125,10 @@ void IDNode::destroy()
"Destroy evaluated ID for %s: id_orig=%p id_cow=%p\n", id_orig->name, id_orig, id_cow);
}
for (ComponentNode *comp_node : components.values()) {
delete comp_node;
}
/* Tag that the node is freed. */
id_orig = nullptr;
}