[Bf-blender-cvs] [a820ba0d36a] blender-v3.2-release: Fix T98216: OpenEXR: No difference in file size between ZIP, DWAA, DWAB.
Bastien Montagne
noreply at git.blender.org
Wed May 18 09:52:40 CEST 2022
Commit: a820ba0d36a05453af4e49b402dd6e893d28ecca
Author: Bastien Montagne
Date: Wed May 18 09:51:11 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rBa820ba0d36a05453af4e49b402dd6e893d28ecca
Fix T98216: OpenEXR: No difference in file size between ZIP, DWAA, DWAB.
Check in code would not expect major version of OpenEXR > 2.
Investigated by Jesse Yurkovich (@deadpin), thanks!
===================================================================
M source/blender/imbuf/intern/openexr/openexr_api.cpp
===================================================================
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;
More information about the Bf-blender-cvs
mailing list