Cleanup: add proper IMB_openexr.h instead of including file from intern/

Referenced by issue #96705, Regression: Crash when pressing F3 outside a Blender window if Developer extras is on

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

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"

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)

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;

source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h

@@ -11,7 +11,7 @@
 
 #include "DNA_color_types.h"
 
-#include "intern/openexr/openexr_multi.h"
+#include "IMB_openexr.h"
 
 namespace blender::compositor {
 

source/blender/compositor/operations/COM_OutputFileOperation.h

@@ -10,7 +10,7 @@
 
 #include "DNA_color_types.h"
 
-#include "intern/openexr/openexr_multi.h"
+#include "IMB_openexr.h"
 
 namespace blender::compositor {
 

source/blender/editors/space_image/image_ops.c

@@ -54,7 +54,7 @@
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 #include "IMB_moviecache.h"
-#include "intern/openexr/openexr_multi.h"
+#include "IMB_openexr.h"
 
 #include "RE_pipeline.h"
 

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

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! */

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
 )
 

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;

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)
 {

source/blender/makesdna/DNA_node_types.h

@@ -761,7 +761,7 @@ typedef struct NodeImageLayer {
   /* index in the Image->layers->passes lists */
   int pass_index DNA_DEPRECATED;
   /* render pass name */
-  /** Amount defined in openexr_multi.h. */
+  /** Amount defined in IMB_openexr.h. */
   char pass_name[64];
 } NodeImageLayer;
 

source/blender/nodes/composite/nodes/node_composite_output_file.cc

@@ -22,9 +22,9 @@
 
 #include "WM_api.h"
 
-#include "node_composite_util.hh"
+#include "IMB_openexr.h"
 
-#include "intern/openexr/openexr_multi.h"
+#include "node_composite_util.hh"
 
 /* **************** OUTPUT FILE ******************** */
 

source/blender/render/RE_pipeline.h

@@ -62,8 +62,8 @@ typedef struct RenderView {
 typedef struct RenderPass {
   struct RenderPass *next, *prev;
   int channels;
-  char name[64];   /* amount defined in openexr_multi.h */
-  char chan_id[8]; /* amount defined in openexr_multi.h */
+  char name[64];   /* amount defined in IMB_openexr.h */
+  char chan_id[8]; /* amount defined in IMB_openexr.h */
   float *rect;
   int rectx, recty;
 

source/blender/render/intern/render_result.c

@@ -34,8 +34,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 "RE_engine.h"