blender
/
blender
126
394
Fork 565
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

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

This commit is contained in:
Clément Foucault 2020-02-17 22:49:13 +01:00
parent d38dfbd13d
commit cc296ef179
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/draw/intern/draw_manager.c
View File

@ -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. */