diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-05-15 08:51:54 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-05-15 08:51:54 +0300 |
| commit | 0d65dda14706e9338c6906b8ed81fca2cb027e34 (patch) | |
| tree | 7693687f8ff90f45ea72085f2904cb866870e799 /source/blender/editors/space_node/node_edit.c | |
| parent | 77a90f7666bf6eb78b8f22ab4abae300aae10ef9 (diff) | |
| parent | b5b72a3f2971094860558969e255b3ee7d7ed989 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_node/node_edit.c')
| -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 1339dbec120..3cb5fd94ea9 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -589,7 +589,8 @@ void snode_set_context(const bContext *C) } if (snode->nodetree != ntree || snode->id != id || snode->from != from || - (snode->treepath.last == NULL && ntree)) { + (snode->treepath.last == NULL && ntree)) + { ED_node_tree_start(snode, ntree, id, from); } } |