diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-09 16:18:21 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-09 16:18:21 +0300 |
| commit | 70f8eaf1b769c402ec61d86f25237d6b64186861 (patch) | |
| tree | 035d1da0dc7ca1ff1cfefad013181dc0ce3084ed /source/blender/editors/space_node/node_draw.c | |
| parent | 2ca8230f67db3d6c4693d0a2e0997dfd5de43091 (diff) | |
| parent | 638de722775fc43c3543a30aaa888372fe93fe98 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/space_view3d/drawobject.c
Diffstat (limited to 'source/blender/editors/space_node/node_draw.c')
| -rw-r--r-- | source/blender/editors/space_node/node_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index 92c055ed12a..8089f47bce4 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -165,7 +165,7 @@ void ED_node_tag_update_nodetree(Main *bmain, bNodeTree *ntree, bNode *node) bool do_tag_update = true; if (node != NULL) { - if (!node_connected_to_output(ntree, node)) { + if (!node_connected_to_output(bmain, ntree, node)) { do_tag_update = false; } } |