[Bf-blender-cvs] [aeff59073b2] master: Fix T86219: Compositor backdrop not using Color Management View Transforms in certain cases

Philipp Oeser noreply at git.blender.org
Thu Mar 18 09:20:16 CET 2021


Commit: aeff59073b23d50a39eb0a614d3907ac0d04994a
Author: Philipp Oeser
Date:   Wed Mar 17 17:49:24 2021 +0100
Branches: master
https://developer.blender.org/rBaeff59073b23d50a39eb0a614d3907ac0d04994a

Fix T86219: Compositor backdrop not using Color Management View
Transforms in certain cases

This was caused by wrong flag checking in {rB278011e44d43}, which just
seems to be a copy-paste error.

For example, enabeling 'Auto-Offset' in the View menu would lead to CM
being ignored.

Maniphest Tasks: T86219

Differential Revision: https://developer.blender.org/D10751

===================================================================

M	source/blender/draw/intern/draw_manager.c

===================================================================

diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 2655319bbd4..a088c27d3f3 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -359,8 +359,8 @@ static void drw_viewport_colormanagement_set(void)
   }
   else if (DST.draw_ctx.space_data && DST.draw_ctx.space_data->spacetype == SPACE_NODE) {
     SpaceNode *snode = (SpaceNode *)DST.draw_ctx.space_data;
-    const eSpaceImage_Flag display_channels_mode = snode->flag;
-    const bool display_color_channel = (display_channels_mode & (SI_SHOW_ALPHA)) == 0;
+    const eSpaceNode_Flag display_channels_mode = snode->flag;
+    const bool display_color_channel = (display_channels_mode & SNODE_SHOW_ALPHA) == 0;
     if (display_color_channel) {
       use_render_settings = true;
     }



More information about the Bf-blender-cvs mailing list