Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2017-02-24 00:09:09 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2017-02-24 00:09:09 +0300
commitdec323659dfe953341f6edbfbeaa174153460079 (patch)
tree14fbcf78b9bd77d2ae4afa26b0a07e7c3a6affcd /source/blender/editors
parent2e83814e186f0d6746f0ce18123d6a5a67e07a64 (diff)
parentc067f1d0d470ada577f2b722b543d814448ce550 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/space_node/node_edit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index ffe510016ff..8a61857675c 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -582,7 +582,7 @@ void snode_set_context(const bContext *C)
}
}
- if (snode->nodetree != ntree || snode->id != id || snode->from != from) {
+ if (snode->nodetree != ntree || snode->id != id || snode->from != from || snode->treepath.last == NULL) {
ED_node_tree_start(snode, ntree, id, from);
}