Fix various issues with (multiview) OpenEXR file save/load.

* Fix saving a multiview render from the image editor giving invalid files.
* Fix failure to load multiview images with a single view per part.
* Fix loss of multiview metadata when saving/loading a single view.
* Fix Z-Buffer writing option for single layer EXR not being respected.

Multiview EXRs are now always handled as multilayer internally, significantly
reducing the amount of code.

Reviewed By: dfelinto

Differential Revision: https://developer.blender.org/D2887

1 files changed, 0 insertions, 13 deletions

diff --git a/source/blender/imbuf/intern/openexr/openexr_multi.h b/source/blender/imbuf/intern/openexr/openexr_multi.h
index 0fa0f64bdce..d9517d13cc4 100644
--- a/source/blender/imbuf/intern/openexr/openexr_multi.h
+++ b/source/blender/imbuf/intern/openexr/openexr_multi.h
@@ -68,7 +68,6 @@ float  *IMB_exr_channel_rect(void *handle, const char *layname, const char *pass
 void    IMB_exr_read_channels(void *handle);
 void    IMB_exr_write_channels(void *handle);
 void    IMB_exrtile_write_channels(void *handle, int partx, int party, int level, const char *viewname);
-void    IMB_exrmultiview_write_channels(void *handle, const char *viewname);
 void    IMB_exr_clear_channels(void *handle);
 
 void    IMB_exr_multilayer_convert(
@@ -78,23 +77,11 @@ void    IMB_exr_multilayer_convert(
         void (*addpass)(void *base, void *lay, const char *str, float *rect, int totchan,
                         const char *chan_id, const char *view));
 
-void    IMB_exr_multiview_convert(
-        void *handle, void *base,
-        void (*addview)(void *base, const char *str),
-        void (*addbuffer)(void *base, const char *str, struct ImBuf *ibuf, const int frame),
-        const int frame);
-
-bool    IMB_exr_multiview_save(
-        struct ImBuf *ibuf, const char *name, const int flags, const int totviews,
-        const char *(*getview)(void *base, int view_id),
-        struct ImBuf *(*getbuffer)(void *base, const int view_id));
-
 void    IMB_exr_close(void *handle);
 
 void    IMB_exr_add_view(void *handle, const char *name);
 
 bool IMB_exr_has_multilayer(void *handle);
-bool IMB_exr_has_singlelayer_multiview(void *handle);
 
 #ifdef __cplusplus
 } // extern "C"