blender
/
blender
136
412
Fork 596
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Fix #115037: Crash deleting tool node group from outliner #115047

Merged
Philipp Oeser merged 4 commits from lichtwerk/blender:115037 into main 2023-11-30 15:48:52 +01:00
Conversation 0 Commits 4 Files Changed 1 +5
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/space_node/space_node.cc
View File

@ -1155,6 +1155,11 @@ static void node_id_remap_cb(ID *old_id, ID *new_id, void *user_data)
}
}
else if (GS(old_id->name) == ID_NT) {
if (&snode->geometry_nodes_tool_tree->id == old_id) {
lichtwerk marked this conversation as resolved Outdated
Bastien Montagne commented 2023-11-17 16:22:00 +01:00
Outdated
Review
Copy Link

Any reason not to just do:

if (snode->geometry_nodes_tool_tree == old_id) {
  snode->geometry_nodes_tool_tree = new_id;
}
Any reason not to just do: ``` if (snode->geometry_nodes_tool_tree == old_id) { snode->geometry_nodes_tool_tree = new_id; } ```
Hans Goudey commented 2023-11-30 13:43:30 +01:00
Outdated
Review
Copy Link

Use &snode->geometry_nodes_tool_tree->id and reinterpret_cast below

Use `&snode->geometry_nodes_tool_tree->id` and `reinterpret_cast` below
snode->geometry_nodes_tool_tree = reinterpret_cast<bNodeTree *>(new_id);
}
lichtwerk marked this conversation as resolved
Bastien Montagne commented 2023-11-17 16:22:34 +01:00
Review
Copy Link

Definitely do NOT want to skip further processing of the NodeEditor path below!

Definitely do *NOT* want to skip further processing of the NodeEditor path below!
bNodeTreePath *path, *path_next;
for (path = (bNodeTreePath *)snode->treepath.first; path; path = path->next) {