Commit: 66e2fc39ce2fbb02eda44775fbaf758d7ddf5834
Author: Dalai Felinto
Date: Tue Apr 14 11:19:23 2015 -0300
Branches: master
https://developer.blender.org/rB66e2fc39ce2fbb02eda44775fbaf758d7ddf5834
Fix T44343 Compositor image node cannot properly load multilayer EXRs
===================================================================
M source/blender/compositor/operations/COM_ImageOperation.cpp
===================================================================
diff --git a/source/blender/compositor/operations/COM_ImageOperation.cpp
b/source/blender/compositor/operations/COM_ImageOperation.cpp
index c140b7a..c55366a 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)) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
