[Bf-blender-cvs] [cc296ef1790] master: DRW: Fix wrong view transform used in solid mode if using workbench engine

[Clément Foucault]

Commit: cc296ef1790e11c64f56b15b25df01b3ef2e3139
Author: Clément Foucault
Date:   Mon Feb 17 22:49:13 2020 +0100
Branches: master
https://developer.blender.org/rBcc296ef1790e11c64f56b15b25df01b3ef2e3139

DRW: Fix wrong view transform used in solid mode if using workbench engine

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

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 2e5d912e0df..80001144cc0 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -295,7 +295,8 @@ static void drw_viewport_colormanagement_set(void)
        ((v3d->shading.type == OB_MATERIAL) && (v3d->shading.flag & V3D_SHADING_SCENE_WORLD)) ||
        ((v3d->shading.type == OB_RENDER) && (v3d->shading.flag & V3D_SHADING_SCENE_WORLD_RENDER)));
   bool use_view_transform = v3d && (v3d->shading.type >= OB_MATERIAL);
-  bool use_render_settings = v3d && (use_workbench || use_scene_lights || use_scene_world);
+  bool use_render_settings = v3d && ((use_workbench && use_view_transform) || use_scene_lights ||
+                                     use_scene_world);
 
   if (use_render_settings) {
     /* Use full render settings, for renders with scene lighting. */