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/blenkernel | |
| parent | 9cf40eee4bd1859ac0968e3988ed0c252eab446e (diff) | |
Cleanup: add proper IMB_openexr.h instead of including file from intern/
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/image.cc | 5 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/image_save.cc | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/movieclip.c | 5 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/studiolight.c | 3 |
4 files changed, 4 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/image.cc b/source/blender/blenkernel/intern/image.cc index f8fb2ec7e45..cfdd048495d 100644 --- a/source/blender/blenkernel/intern/image.cc +++ b/source/blender/blenkernel/intern/image.cc @@ -29,10 +29,7 @@ #include "IMB_imbuf_types.h" #include "IMB_metadata.h" #include "IMB_moviecache.h" - -#ifdef WITH_OPENEXR -# include "intern/openexr/openexr_multi.h" -#endif +#include "IMB_openexr.h" /* Allow using deprecated functionality for .blend file I/O. */ #define DNA_DEPRECATED_ALLOW diff --git a/source/blender/blenkernel/intern/image_save.cc b/source/blender/blenkernel/intern/image_save.cc index 3e7bc8a954a..f6ea814cbc0 100644 --- a/source/blender/blenkernel/intern/image_save.cc +++ b/source/blender/blenkernel/intern/image_save.cc @@ -19,8 +19,7 @@ #include "IMB_colormanagement.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" - -#include "intern/openexr/openexr_multi.h" +#include "IMB_openexr.h" #include "BKE_colortools.h" #include "BKE_image.h" diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c index c23110b4703..3a93b7cde84 100644 --- a/source/blender/blenkernel/intern/movieclip.c +++ b/source/blender/blenkernel/intern/movieclip.c @@ -60,6 +60,7 @@ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" #include "IMB_moviecache.h" +#include "IMB_openexr.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" @@ -68,10 +69,6 @@ #include "BLO_read_write.h" -#ifdef WITH_OPENEXR -# include "intern/openexr/openexr_multi.h" -#endif - static void free_buffers(MovieClip *clip); static void movie_clip_init_data(ID *id) diff --git a/source/blender/blenkernel/intern/studiolight.c b/source/blender/blenkernel/intern/studiolight.c index 811b6bfe182..7d0c6598440 100644 --- a/source/blender/blenkernel/intern/studiolight.c +++ b/source/blender/blenkernel/intern/studiolight.c @@ -25,13 +25,12 @@ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" +#include "IMB_openexr.h" #include "GPU_texture.h" #include "MEM_guardedalloc.h" -#include "intern/openexr/openexr_multi.h" - /* Statics */ static ListBase studiolights; static int last_studiolight_id = 0; |