diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2017-05-12 16:36:52 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2017-05-12 16:36:52 +0300 |
| commit | 18a96e39ea9318d7cca1d4d0bfc19ad81a6dff34 (patch) | |
| tree | 1670dc639a2b5dc0969d8edcc56bf70b0425214d /source/blender/editors/space_node | |
| parent | 56859ae7fd810db0e7409dafb72f26f8bef0e5ae (diff) | |
| parent | 37bc3850cee29b10f4b5a4ff76e663c95b31f1dc (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_node')
| -rw-r--r-- | source/blender/editors/space_node/node_edit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 107a84cf530..1339dbec120 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -588,7 +588,8 @@ void snode_set_context(const bContext *C) } } - if (snode->nodetree != ntree || snode->id != id || snode->from != from || snode->treepath.last == NULL) { + if (snode->nodetree != ntree || snode->id != id || snode->from != from || + (snode->treepath.last == NULL && ntree)) { ED_node_tree_start(snode, ntree, id, from); } } |