Commit: e54f38ebf0b4521f2e0ac0664dfb7d29c6f01f5b
Author: Campbell Barton
Date: Fri Oct 23 17:06:42 2015 +1100
Branches: blender-v2.76-release
https://developer.blender.org/rBe54f38ebf0b4521f2e0ac0664dfb7d29c6f01f5b
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 3aa2ba8..5eb8e7d 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -2855,11 +2855,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);
+ }
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
