Multiview: compositor was not updating when multiview was off
authorDalai Felinto <dfelinto@gmail.com>
Tue, 7 Apr 2015 19:37:16 +0000 (16:37 -0300)
committerDalai Felinto <dfelinto@gmail.com>
Tue, 7 Apr 2015 19:38:21 +0000 (16:38 -0300)
source/blender/editors/space_node/node_edit.c

index 80ecab09442c1ead8d0c4fe08369c0a452db6f8f..360087d77c7977591158b83e8191681e7f6df7da 100644 (file)
@@ -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;