From 336c85957bf537af4f6f51f130212edbc890de9e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 23 Jul 2025 10:30:07 +1000 Subject: [PATCH] Fix: match RenderPass::chan_id size with EXR_PASS_MAXCHAN MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Missed in [0] which increased the size in openexr_multi.h but didn't update RE_pipeline.h. [0]: d5f1b9c2223333e03f2e4994171ad9df8c1c4f21⏎ --- source/blender/imbuf/IMB_openexr.hh | 2 +- source/blender/render/RE_pipeline.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/imbuf/IMB_openexr.hh b/source/blender/imbuf/IMB_openexr.hh index e13d4a26676..fd50d5733c4 100644 --- a/source/blender/imbuf/IMB_openexr.hh +++ b/source/blender/imbuf/IMB_openexr.hh @@ -11,11 +11,11 @@ /* API for reading and writing multi-layer EXR files. */ /* XXX layer+pass name max 64? */ -/* This API also supports max 8 channels per pass now. easy to fix! */ #define EXR_LAY_MAXNAME 64 #define EXR_PASS_MAXNAME 64 #define EXR_VIEW_MAXNAME 64 #define EXR_TOT_MAXNAME 64 +/** Number of supported channels per pass (easy to change). */ #define EXR_PASS_MAXCHAN 24 struct StampData; diff --git a/source/blender/render/RE_pipeline.h b/source/blender/render/RE_pipeline.h index ea2028f79a1..9e0af63eb63 100644 --- a/source/blender/render/RE_pipeline.h +++ b/source/blender/render/RE_pipeline.h @@ -52,7 +52,7 @@ struct RenderPass { struct RenderPass *next, *prev; int channels; char name[/*EXR_PASS_MAXNAME*/ 64]; - char chan_id[8]; /* amount defined in IMB_openexr.hh */ + char chan_id[/*EXR_PASS_MAXCHAN*/ 24]; /** * Image buffer which contains data of this pass.