[Bf-blender-cvs] [982b498c22a] master: OVERLAY: Viewport Background Color visible in Material Preview Mode

[Jeroen Bakker]

Commit: 982b498c22a3f4c7dc9c8ec8827d24724e16d9c6
Author: Jeroen Bakker
Date:   Tue Mar 10 11:34:33 2020 +0100
Branches: master
https://developer.blender.org/rB982b498c22a3f4c7dc9c8ec8827d24724e16d9c6

OVERLAY: Viewport Background Color visible in Material Preview Mode

When user used a custom background color, this color was also visible in
material preview mode, when the world opacity was less than 1. This
patch will draw the theme color as it was used to.

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

M	source/blender/draw/engines/overlay/overlay_background.c

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

diff --git a/source/blender/draw/engines/overlay/overlay_background.c b/source/blender/draw/engines/overlay/overlay_background.c
index 880f5c49b3e..286a9311989 100644
--- a/source/blender/draw/engines/overlay/overlay_background.c
+++ b/source/blender/draw/engines/overlay/overlay_background.c
@@ -63,7 +63,8 @@ void OVERLAY_background_cache_init(OVERLAY_Data *vedata)
       copy_v3_v3(color_override, &scene->world->horr);
       color_override[3] = 1.0f;
     }
-    else if (v3d->shading.background_type == V3D_SHADING_BACKGROUND_VIEWPORT) {
+    else if (v3d->shading.background_type == V3D_SHADING_BACKGROUND_VIEWPORT &&
+             v3d->shading.type <= OB_SOLID) {
       background_type = BG_SOLID;
       copy_v3_v3(color_override, v3d->shading.background_color);
       color_override[3] = 1.0f;