[Bf-blender-cvs] [a6b156bf578] master: Color management: When look is applied, we can not consider spaces to match
Sergey Sharybin
noreply at git.blender.org
Mon Sep 18 15:10:26 CEST 2017
Commit: a6b156bf57864072aa2cab8b251a8fb3b0ee7b34
Author: Sergey Sharybin
Date: Mon Sep 18 18:09:53 2017 +0500
Branches: master
https://developer.blender.org/rBa6b156bf57864072aa2cab8b251a8fb3b0ee7b34
Color management: When look is applied, we can not consider spaces to match
This should fix T52812 after merge to blender2.8.
===================================================================
M source/blender/imbuf/intern/colormanagement.c
===================================================================
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;
More information about the Bf-blender-cvs
mailing list