[Bf-blender-cvs] [cc9c049] master: Multiview: compositor - avoid trashing image viewer views/buffers when multiview is off

[Dalai Felinto]

Commit: cc9c049ff7695ba5fa6a48d468bf3d18602d330e
Author: Dalai Felinto
Date:   Tue Apr 7 16:56:26 2015 -0300
Branches: master
https://developer.blender.org/rBcc9c049ff7695ba5fa6a48d468bf3d18602d330e

Multiview: compositor - avoid trashing image viewer views/buffers when multiview is off

I found this while investigating why the backdrop shows 'blank' while I
update a node influence factor. This problem still persist, but maybe it
was there before multiview. In release it is not noticeable, but in my
debug build is quite evident.

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

M	source/blender/blenkernel/intern/image.c

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

diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index f852d88..bd0daf3 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -2357,11 +2357,16 @@ Image *BKE_image_verify_viewer(int type, const char *name)
 
 static void image_viewer_create_views(const RenderData *rd, Image *ima)
 {
-	SceneRenderView *srv;
-	for (srv = rd->views.first; srv; srv = srv->next) {
-		if (BKE_scene_multiview_is_render_view_active(rd, srv) == false)
-			continue;
-		image_add_view(ima, srv->name, "");
+	if ((rd->scemode & R_MULTIVIEW) == 0) {
+		image_add_view(ima, "", "");
+	}
+	else {
+		SceneRenderView *srv;
+		for (srv = rd->views.first; srv; srv = srv->next) {
+			if (BKE_scene_multiview_is_render_view_active(rd, srv) == false)
+				continue;
+			image_add_view(ima, srv->name, "");
+		}
 	}
 }