Fix for error w/ RenderView in ImageView list

This commit is contained in:
Campbell Barton 2015-10-23 17:06:42 +11:00
parent b2f8da1c53
commit 48f4e1a63f
1 changed files with 12 additions and 1 deletions

View File

@ -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);
}
}
}