diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-07-13 14:58:17 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-07-13 14:58:17 +0300 |
| commit | e142ae77cadf04103fbc643f21cf60891862f6a8 (patch) | |
| tree | 142e25fccd5ba3e748a1652706e7e4f1220ca289 /source/blender/imbuf/intern/oiio | |
| parent | 107bbee4c763c95ea5d07a3b2f08bfe3b6adb24c (diff) | |
Imbuf types refactor.
ImBuf types were getting stored as bitflags in a 32bit integer which had
already run out of space. Solved the problem by separating file type to
an ftype enum, and file specific options to foptions.
Reviewed by Campbell, thanks a lot!
Diffstat (limited to 'source/blender/imbuf/intern/oiio')
| -rw-r--r-- | source/blender/imbuf/intern/oiio/openimageio_api.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/oiio/openimageio_api.cpp b/source/blender/imbuf/intern/oiio/openimageio_api.cpp index 7728183d3b6..0a2e8742ba8 100644 --- a/source/blender/imbuf/intern/oiio/openimageio_api.cpp +++ b/source/blender/imbuf/intern/oiio/openimageio_api.cpp @@ -268,7 +268,7 @@ struct ImBuf *imb_load_photoshop(const char *filename, int flags, char colorspac return NULL; /* ImBuf always needs 4 channels */ - ibuf->ftype = PSD; + ibuf->ftype = IMB_FTYPE_PSD; ibuf->channels = 4; ibuf->planes = (3 + (is_alpha ? 1 : 0)) * 4 << basesize; |