diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-09-18 16:10:39 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-09-18 16:10:39 +0300 |
| commit | ad80bfdab9c82695df240c8b5a5d19a2b5b84254 (patch) | |
| tree | 486c9084801db36a7ec2d18d2ca53426491355e9 /source/blender/imbuf | |
| parent | e6d5b94e83256b4a79c71667054b402f4dfb8232 (diff) | |
| parent | a6b156bf57864072aa2cab8b251a8fb3b0ee7b34 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/colormanagement.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c index f510ded6b60..863bce125c5 100644 --- a/source/blender/imbuf/intern/colormanagement.c +++ b/source/blender/imbuf/intern/colormanagement.c @@ -1522,6 +1522,10 @@ static bool is_ibuf_rect_in_display_space(ImBuf *ibuf, const ColorManagedViewSet { const char *from_colorspace = ibuf->rect_colorspace->name; const char *to_colorspace = IMB_colormanagement_get_display_colorspace_name(view_settings, display_settings); + ColorManagedLook *look_descr = colormanage_look_get_named(view_settings->look); + if (look_descr != NULL && !STREQ(look_descr->process_space, "")) { + return false; + } if (to_colorspace && STREQ(from_colorspace, to_colorspace)) return true; |