diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-11-30 07:46:26 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-30 07:49:06 +0300 |
commit | a760e73dcf6f0a0da901359d1456ad5ca180ebeb (patch) | |
tree | 9e0be802377a153e8d6fc37b2eec163be6ff5d12 /source/blender/imbuf | |
parent | a687d98e67823932f95bc3c1b1452109282a3e41 (diff) | |
parent | 6429e6c91ef4422083ed56b068dea636a322fe12 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r-- | source/blender/imbuf/intern/colormanagement.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c index 1d287025a4e..86c4156ad8b 100644 --- a/source/blender/imbuf/intern/colormanagement.c +++ b/source/blender/imbuf/intern/colormanagement.c @@ -1133,8 +1133,7 @@ void IMB_colormanagement_check_file_config(Main *bmain) if (seq->strip) { colormanage_check_colorspace_settings(&seq->strip->colorspace_settings, "sequencer strip"); } - } - SEQ_END + } SEQ_END; } /* ** check input color space settings ** */ |