diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-02-18 00:49:13 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2020-02-18 00:49:17 +0300 |
| commit | cc296ef1790e11c64f56b15b25df01b3ef2e3139 (patch) | |
| tree | c7b55620fee20021042e89e970145e0734a658f5 /source/blender/draw/intern/draw_manager.c | |
| parent | d38dfbd13d4be6ca6ddda5cd7f6597bfb917f9c9 (diff) | |
DRW: Fix wrong view transform used in solid mode if using workbench engine
Diffstat (limited to 'source/blender/draw/intern/draw_manager.c')
| -rw-r--r-- | source/blender/draw/intern/draw_manager.c | 3 |
1 files changed, 2 insertions, 1 deletions
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. */ |