[Bf-blender-cvs] [d59721c2c31] master: Fix T50673: OpenEXR multilayer image truncated on save

Sergey Sharybin noreply at git.blender.org
Tue May 16 16:35:20 CEST 2017


Commit: d59721c2c311b18845a89fa30a9291a02f36d099
Author: Sergey Sharybin
Date:   Tue May 16 16:34:49 2017 +0200
Branches: master
https://developer.blender.org/rBd59721c2c311b18845a89fa30a9291a02f36d099

Fix T50673: OpenEXR multilayer image truncated on save

The issue is in OpenEXR itself. See the report fomr some more details.

===================================================================

M	source/blender/blenloader/intern/versioning_270.c
M	source/blender/makesrna/intern/rna_scene.c

===================================================================

diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index c187766b586..d3260db1477 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -1634,6 +1634,14 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 			}
 		} FOREACH_NODETREE_END
 	}
+
+	{
+		for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+			if (scene->r.im_format.exr_codec == R_IMF_EXR_CODEC_DWAB) {
+				scene->r.im_format.exr_codec = R_IMF_EXR_CODEC_DWAA;
+			}
+		}
+	}
 }
 
 void do_versions_after_linking_270(Main *main)
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 9130bdc6f7b..333833a79eb 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -88,7 +88,8 @@ EnumPropertyItem rna_enum_exr_codec_items[] = {
 	{R_IMF_EXR_CODEC_B44, "B44", 0, "B44 (lossy)", ""},
 	{R_IMF_EXR_CODEC_B44A, "B44A", 0, "B44A (lossy)", ""},
 	{R_IMF_EXR_CODEC_DWAA, "DWAA", 0, "DWAA (lossy)", ""},
-	{R_IMF_EXR_CODEC_DWAB, "DWAB", 0, "DWAB (lossy)", ""},
+	/* NOTE: Commented out for until new OpenEXR is released, see T50673. */
+	/* {R_IMF_EXR_CODEC_DWAB, "DWAB", 0, "DWAB (lossy)", ""}, */
 	{0, NULL, 0, NULL, NULL}
 };
 #endif




More information about the Bf-blender-cvs mailing list