[Bf-blender-cvs] [00f3ab2fb2d] master: Fix T51898: missing sequence strip color space validation on load.
Brecht Van Lommel
noreply at git.blender.org
Mon Jul 10 01:22:11 CEST 2017
Commit: 00f3ab2fb2df9047b34943728621d12746b5d363
Author: Brecht Van Lommel
Date: Mon Jul 10 01:03:20 2017 +0200
Branches: master
https://developer.blender.org/rB00f3ab2fb2df9047b34943728621d12746b5d363
Fix T51898: missing sequence strip color space validation on load.
===================================================================
M source/blender/imbuf/intern/colormanagement.c
===================================================================
diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c
index ff19a14dbff..03f71b5878c 100644
--- a/source/blender/imbuf/intern/colormanagement.c
+++ b/source/blender/imbuf/intern/colormanagement.c
@@ -63,6 +63,7 @@
#include "BKE_context.h"
#include "BKE_image.h"
#include "BKE_main.h"
+#include "BKE_sequencer.h"
#include "RNA_define.h"
@@ -1112,6 +1113,7 @@ void IMB_colormanagement_check_file_config(Main *bmain)
for (scene = bmain->scene.first; scene; scene = scene->id.next) {
ColorManagedColorspaceSettings *sequencer_colorspace_settings;
+ /* check scene color management settings */
colormanage_check_display_settings(&scene->display_settings, "scene", default_display);
colormanage_check_view_settings(&scene->display_settings, &scene->view_settings, "scene");
@@ -1122,6 +1124,15 @@ void IMB_colormanagement_check_file_config(Main *bmain)
if (sequencer_colorspace_settings->name[0] == '\0') {
BLI_strncpy(sequencer_colorspace_settings->name, global_role_default_sequencer, MAX_COLORSPACE_NAME);
}
+
+ /* check sequencer strip input color space settings */
+ Sequence *seq;
+ SEQ_BEGIN (scene->ed, seq) {
+ if (seq->strip) {
+ colormanage_check_colorspace_settings(&seq->strip->colorspace_settings, "sequencer strip");
+ }
+ }
+ SEQ_END
}
/* ** check input color space settings ** */
More information about the Bf-blender-cvs
mailing list