diff options
author | Bastien Montagne <bastien@blender.org> | 2020-05-11 18:38:50 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2020-05-11 18:38:50 +0300 |
commit | 15e71781b91525d6e05e1f1f5d6fd065166dbaa8 (patch) | |
tree | 7623e245c2e28b8143ee358d7b0f7f82c6fad2a3 /source/blender/editors/space_node/space_node.c | |
parent | 6f5bc1fc2b4b3cea6d23ae86a44dfd06848b642e (diff) | |
parent | 4e1a6b48e725186822117a9cce86e07ec85de28b (diff) |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/editors/space_node/space_node.c')
-rw-r--r-- | source/blender/editors/space_node/space_node.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c index 30fe9a1ed11..f339d11b842 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); - - /* XXX Untested in case new_id != NULL... */ - snode->id = new_id; - snode->from = NULL; - snode->nodetree = NULL; - snode->edittree = NULL; - } + 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; } else if (GS(old_id->name) == ID_OB) { if (snode->from == old_id) { |