From 4e1a6b48e725186822117a9cce86e07ec85de28b Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 11 May 2020 17:24:56 +0200 Subject: [PATCH] Fix T76559: Crash after deleting material leaves invalid pointer in node editor. No idea why node editor remap callback was only handling scene IDs (and not any other ntree owner)... Note that this should be a safe fix, but it unvails a nice can of worm, at some point we should ba able to handle all of that through libquery only, get rid of editor's remap callbacks, and probably sanitize usages of ID pointers by some of them, like that nodetree editor. Current situation remains a fairly fragile mess... --- .../blender/editors/space_node/space_node.c | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c index b6ee393b991..9df04c097bb 100644 --- a/source/blender/editors/space_node/space_node.c +++ b/source/blender/editors/space_node/space_node.c @@ -855,19 +855,17 @@ static void node_id_remap(ScrArea *UNUSED(area), SpaceLink *slink, ID *old_id, I { SpaceNode *snode = (SpaceNode *)slink; - if (GS(old_id->name) == ID_SCE) { - if (snode->id == old_id) { - /* nasty DNA logic for SpaceNode: - * ideally should be handled by editor code, but would be bad level call - */ - BLI_freelistN(&snode->treepath); + if (snode->id == old_id) { + /* nasty DNA logic for SpaceNode: + * ideally should be handled by editor code, but would be bad level call + */ + BLI_freelistN(&snode->treepath); - /* XXX Untested in case new_id != NULL... */ - snode->id = new_id; - snode->from = NULL; - snode->nodetree = NULL; - snode->edittree = NULL; - } + /* XXX Untested in case new_id != NULL... */ + snode->id = new_id; + snode->from = NULL; + snode->nodetree = NULL; + snode->edittree = NULL; } else if (GS(old_id->name) == ID_OB) { if (snode->from == old_id) {