From 66e2fc39ce2fbb02eda44775fbaf758d7ddf5834 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Tue, 14 Apr 2015 11:19:23 -0300 Subject: Fix T44343 Compositor image node cannot properly load multilayer EXRs --- source/blender/compositor/operations/COM_ImageOperation.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source/blender/compositor') diff --git a/source/blender/compositor/operations/COM_ImageOperation.cpp b/source/blender/compositor/operations/COM_ImageOperation.cpp index c140b7afbd7..c55366ab370 100644 --- a/source/blender/compositor/operations/COM_ImageOperation.cpp +++ b/source/blender/compositor/operations/COM_ImageOperation.cpp @@ -70,8 +70,12 @@ ImBuf *BaseImageOperation::getImBuf() ImBuf *ibuf; ImageUser iuser = *this->m_imageUser; + if (this->m_image == NULL) + return NULL; + /* local changes to the original ImageUser */ - iuser.multi_index = BKE_scene_multiview_view_id_get(this->m_rd, this->m_viewName); + if (BKE_image_is_multilayer(this->m_image) == false) + iuser.multi_index = BKE_scene_multiview_view_id_get(this->m_rd, this->m_viewName); ibuf = BKE_image_acquire_ibuf(this->m_image, &iuser, NULL); if (ibuf == NULL || (ibuf->rect == NULL && ibuf->rect_float == NULL)) { -- cgit v1.2.3