diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-07-10 09:35:56 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-07-10 09:35:56 +0300 |
commit | 2bd908ca6ebc97873ad94735facc1e8188a009b0 (patch) | |
tree | 595d428fe2a71e5bbfa577c0dc0d3b49af35524b /source/blender/imbuf | |
parent | 2ad524bc83c3e67ac65c65ac2edb227848df2b21 (diff) | |
parent | c055536d23085c2de1c18636e63a64d8c712896f (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r-- | source/blender/imbuf/intern/colormanagement.c | 11 |
1 files changed, 11 insertions, 0 deletions
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 ** */ |