blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Merge branch 'blender-v2.83-release'

This commit is contained in:
Bastien Montagne 2020-05-11 17:38:50 +02:00
parent 6f5bc1fc2b 4e1a6b48e7
commit 15e71781b9
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/editors/space_node/space_node.c
View File

@ -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) {