diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-26 17:54:13 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-26 17:54:13 +0300 |
| commit | 94d88df3a8954f8c9c3be3c6a4ea9dce0dceb849 (patch) | |
| tree | 1b9751fb6b665de1203f079d5d2bafabd44eb007 /source/blender/imbuf | |
| parent | 115e1d441b5d005bb3c53a134d1ad2683ffb9735 (diff) | |
| parent | b7a9e980a11a085a3bc7ef8e267b967197f47447 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/oiio/openimageio_api.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/oiio/openimageio_api.cpp b/source/blender/imbuf/intern/oiio/openimageio_api.cpp index 34d5cccac84..7c64fdfc9df 100644 --- a/source/blender/imbuf/intern/oiio/openimageio_api.cpp +++ b/source/blender/imbuf/intern/oiio/openimageio_api.cpp @@ -203,7 +203,6 @@ struct ImBuf *imb_load_photoshop(const char *filename, int flags, char colorspac struct ImBuf *ibuf = NULL; int width, height, components; bool is_float, is_alpha; - TypeDesc typedesc; int basesize; char file_colorspace[IM_MAX_SPACE]; |