[Bf-blender-cvs] [48f4e1a] master: Fix for error w/ RenderView in ImageView list

[Campbell Barton]

Commit: 48f4e1a63f2c2a858d05feabcf215f6d017722d0
Author: Campbell Barton
Date:   Fri Oct 23 17:06:42 2015 +1100
Branches: master
https://developer.blender.org/rB48f4e1a63f2c2a858d05feabcf215f6d017722d0

Fix for error w/ RenderView in ImageView list

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

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

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

diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index be7c617..8f8ce6e 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -2864,11 +2864,22 @@ bool BKE_image_is_stereo(Image *ima)
             BLI_findstring(&ima->views, STEREO_RIGHT_NAME, offsetof(ImageView, name)));
 }
 
+static void image_view_from_render_view(ImageView *iv_dst, RenderView *rv_src)
+{
+	BLI_strncpy(iv_dst->name, rv_src->name, sizeof(iv_dst->name));
+}
+
 static void image_init_multilayer_multiview(Image *ima, RenderResult *rr)
 {
 	BKE_image_free_views(ima);
 	if (rr) {
-		BLI_duplicatelist(&ima->views, &rr->views);
+		RenderView *rv_src;
+		for (rv_src = rr->views.first; rv_src; rv_src = rv_src->next) {
+			ImageView *iv_dst;
+			iv_dst = MEM_callocN(sizeof(ImageView), "Viewer Image View");
+			image_view_from_render_view(iv_dst, rv_src);
+			BLI_addhead(&ima->views, iv_dst);
+		}
 	}
 }