diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2015-04-14 17:19:23 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2015-04-14 17:21:01 +0300 |
| commit | 66e2fc39ce2fbb02eda44775fbaf758d7ddf5834 (patch) | |
| tree | 0c25f4c91d73a216702166c2424bd327e6b9cab4 /source/blender/compositor | |
| parent | f1355d0b45cf8c0d170c9ad0fdf7f36ef8ac1585 (diff) | |
Fix T44343 Compositor image node cannot properly load multilayer EXRs
Diffstat (limited to 'source/blender/compositor')
| -rw-r--r-- | source/blender/compositor/operations/COM_ImageOperation.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
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)) { |