diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-06-19 08:06:48 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-19 08:06:48 +0300 |
| commit | 9649c6bef548a799ea620a4ac1abce7935849f2e (patch) | |
| tree | 4d32a14aa4302cf4c965023cd955db24bb3359c2 /source/blender/editors/space_node | |
| parent | cf7447dacbc3c5c0d5fb80e3b082d745e4955e12 (diff) | |
| parent | 72c9141a7a56fa4762ac0daae501f1609532506c (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 | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_node/space_node.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 2c2329fc44f..c70cbeef52f 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -2095,7 +2095,7 @@ static int node_clipboard_paste_exec(bContext *C, wmOperator *op) /* make sure all clipboard nodes would be valid in the target tree */ all_nodes_valid = true; for (node = clipboard_nodes_lb->first; node; node = node->next) { - if (!node->typeinfo->poll_instance(node, ntree)) { + if (!node->typeinfo->poll_instance || !node->typeinfo->poll_instance(node, ntree)) { all_nodes_valid = false; BKE_reportf(op->reports, RPT_ERROR, "Cannot add node %s into node tree %s", node->name, ntree->id.name + 2); } diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c index 2f1e6d38d3d..c1099f38d92 100644 --- a/source/blender/editors/space_node/space_node.c +++ b/source/blender/editors/space_node/space_node.c @@ -777,6 +777,10 @@ static void node_region_listener( break; } break; + case NC_WM: + if (wmn->data == ND_JOB) + ED_region_tag_redraw(ar); + break; case NC_SCENE: ED_region_tag_redraw(ar); if (wmn->data == ND_RENDER_RESULT) { |