diff options
author | Brecht Van Lommel <brecht@blender.org> | 2022-03-22 02:54:42 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2022-03-22 03:30:19 +0300 |
commit | 8bccc7d8611a7379adc8d981bca18938ab0a5c27 (patch) | |
tree | 2e58f0f4d183ecf67ef2fa38f1b22d939818dfae /source/blender/imbuf | |
parent | 9cf40eee4bd1859ac0968e3988ed0c252eab446e (diff) |
Cleanup: add proper IMB_openexr.h instead of including file from intern/
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r-- | source/blender/imbuf/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/imbuf/IMB_openexr.h (renamed from source/blender/imbuf/intern/openexr/openexr_multi.h) | 4 | ||||
-rw-r--r-- | source/blender/imbuf/intern/openexr/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/openexr/openexr_api.cpp | 3 | ||||
-rw-r--r-- | source/blender/imbuf/intern/openexr/openexr_stub.cpp | 3 |
5 files changed, 6 insertions, 7 deletions
diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index 294aa8bbb9c..25961e6e1d5 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -57,6 +57,7 @@ set(SRC IMB_imbuf_types.h IMB_metadata.h IMB_moviecache.h + IMB_openexr.h IMB_thumbs.h intern/IMB_allocimbuf.h intern/IMB_anim.h diff --git a/source/blender/imbuf/intern/openexr/openexr_multi.h b/source/blender/imbuf/IMB_openexr.h index f5a2f983b18..a41053b99bf 100644 --- a/source/blender/imbuf/intern/openexr/openexr_multi.h +++ b/source/blender/imbuf/IMB_openexr.h @@ -2,12 +2,12 @@ * Copyright 2006 Blender Foundation. All rights reserved. */ /** \file - * \ingroup openexr + * \ingroup imbuf */ #pragma once -/* Experiment with more advanced EXR API. */ +/* API for reading and writing multilayer EXR files. */ /* XXX layer+pass name max 64? */ /* This api also supports max 8 channels per pass now. easy to fix! */ diff --git a/source/blender/imbuf/intern/openexr/CMakeLists.txt b/source/blender/imbuf/intern/openexr/CMakeLists.txt index 08b17764d12..681176d8cc4 100644 --- a/source/blender/imbuf/intern/openexr/CMakeLists.txt +++ b/source/blender/imbuf/intern/openexr/CMakeLists.txt @@ -18,8 +18,6 @@ set(INC_SYS set(SRC openexr_api.h - openexr_multi.h - openexr_api.cpp ) diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index d9b623cb765..aff9257d1f2 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -90,8 +90,7 @@ _CRTIMP void __cdecl _invalid_parameter_noinfo(void) #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" #include "IMB_metadata.h" - -#include "openexr_multi.h" +#include "IMB_openexr.h" using namespace Imf; using namespace Imath; diff --git a/source/blender/imbuf/intern/openexr/openexr_stub.cpp b/source/blender/imbuf/intern/openexr/openexr_stub.cpp index 4ca4a8313b1..2a655360aa5 100644 --- a/source/blender/imbuf/intern/openexr/openexr_stub.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_stub.cpp @@ -6,7 +6,8 @@ */ #include "openexr_api.h" -#include "openexr_multi.h" + +#include "IMB_openexr.h" void *IMB_exr_get_handle(void) { |