diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-04-08 13:50:39 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-04-08 13:50:39 +0300 |
| commit | d4c002d5372176c131bd81981eebb60ace11cb90 (patch) | |
| tree | f046a6d995a9b63688235de3a0fef5a4f7e10041 /source/blender/editors/space_node | |
| parent | c29d7a2c2b056f9b432a6c6841b78353c6d267a9 (diff) | |
| parent | 235f1feaf4f28f0d3bf3b608ba447b9b0ef5aedc (diff) | |
Merge branch 'master' into gooseberry
Diffstat (limited to 'source/blender/editors/space_node')
| -rw-r--r-- | source/blender/editors/space_node/node_edit.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index e2bcf358a33..030b54a22db 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -239,9 +239,14 @@ static void compo_startjob(void *cjv, short *stop, short *do_update, float *prog // XXX BIF_store_spare(); /* 1 is do_previews */ - for (srv = scene->r.views.first; srv; srv = srv->next) { - if (BKE_scene_multiview_is_render_view_active(&scene->r, srv) == false) continue; - ntreeCompositExecTree(cj->scene, ntree, &cj->scene->r, false, true, &scene->view_settings, &scene->display_settings, srv->name); + if ((cj->scene->r.scemode & R_MULTIVIEW) == 0) { + ntreeCompositExecTree(cj->scene, ntree, &cj->scene->r, false, true, &scene->view_settings, &scene->display_settings, ""); + } + else { + for (srv = scene->r.views.first; srv; srv = srv->next) { + if (BKE_scene_multiview_is_render_view_active(&scene->r, srv) == false) continue; + ntreeCompositExecTree(cj->scene, ntree, &cj->scene->r, false, true, &scene->view_settings, &scene->display_settings, srv->name); + } } ntree->test_break = NULL; |