[Bf-blender-cvs] [4c2306d] master: Multiview: compositor was not updating when multiview was off

[Dalai Felinto]

Commit: 4c2306d21a2a1aea37261c5a6c92b6c2bff55e9f
Author: Dalai Felinto
Date:   Tue Apr 7 16:37:16 2015 -0300
Branches: master
https://developer.blender.org/rB4c2306d21a2a1aea37261c5a6c92b6c2bff55e9f

Multiview: compositor was not updating when multiview was off

===================================================================

M	source/blender/editors/space_node/node_edit.c

===================================================================

diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index 80ecab0..360087d 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;