[Bf-blender-cvs] [3abf56db27a] master: Cleanup: Draw Manager remove do_color_management from drawing context.

Jeroen Bakker noreply at git.blender.org
Tue Aug 31 14:27:51 CEST 2021


Commit: 3abf56db27a5c0e5a67ee7195ea40dabd8d3b0a7
Author: Jeroen Bakker
Date:   Tue Aug 31 12:00:07 2021 +0200
Branches: master
https://developer.blender.org/rB3abf56db27a5c0e5a67ee7195ea40dabd8d3b0a7

Cleanup: Draw Manager remove do_color_management from drawing context.

The do_color_management option was set, but never read.

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

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

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

diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index df0e3566891..294ac6d8d2b 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1524,7 +1524,6 @@ void DRW_draw_view(const bContext *C)
                              (v3d->overlay.flag & V3D_OVERLAY_HIDE_TEXT) != 0);
     DST.options.draw_background = (scene->r.alphamode == R_ADDSKY) ||
                                   (v3d->shading.type != OB_RENDER);
-    DST.options.do_color_management = true;
     DRW_draw_render_loop_ex(depsgraph, engine_type, region, v3d, viewport, C);
   }
   else {
@@ -1716,7 +1715,6 @@ void DRW_draw_render_loop_offscreen(struct Depsgraph *depsgraph,
   /* Reset before using it. */
   drw_state_prepare_clean_for_draw(&DST);
   DST.options.is_image_render = is_image_render;
-  DST.options.do_color_management = do_color_management;
   DST.options.draw_background = draw_background;
   DRW_draw_render_loop_ex(depsgraph, engine_type, region, v3d, render_viewport, NULL);
 
diff --git a/source/blender/draw/intern/draw_manager.h b/source/blender/draw/intern/draw_manager.h
index 512c2775850..a7015b25770 100644
--- a/source/blender/draw/intern/draw_manager.h
+++ b/source/blender/draw/intern/draw_manager.h
@@ -543,7 +543,6 @@ typedef struct DRWManager {
     uint is_depth : 1;
     uint is_image_render : 1;
     uint is_scene_render : 1;
-    uint do_color_management : 1;
     uint draw_background : 1;
     uint draw_text : 1;
   } options;



More information about the Bf-blender-cvs mailing list