diff options
| author | Bastien Montagne <bastien@blender.org> | 2022-05-18 10:52:53 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2022-05-18 10:52:53 +0300 |
| commit | ba2c6c90face552eff4a85f093639788d0ca9d57 (patch) | |
| tree | e4a48a883719e836a72af945348bda02f2b74ceb | |
| parent | 418184d1c15df149ab701cdb570c278276b558a7 (diff) | |
| parent | a820ba0d36a05453af4e49b402dd6e893d28ecca (diff) | |
Merge branch 'blender-v3.2-release'
| -rw-r--r-- | source/blender/imbuf/intern/openexr/openexr_api.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index 2281d8d85b3..66ee3cf2c26 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -363,7 +363,7 @@ static void openexr_header_compression(Header *header, int compression) case R_IMF_EXR_CODEC_B44A: header->compression() = B44A_COMPRESSION; break; -#if OPENEXR_VERSION_MAJOR >= 2 && OPENEXR_VERSION_MINOR >= 2 +#if OPENEXR_VERSION_MAJOR > 2 || (OPENEXR_VERSION_MAJOR >= 2 && OPENEXR_VERSION_MINOR >= 2) case R_IMF_EXR_CODEC_DWAA: header->compression() = DWAA_COMPRESSION; break; |