[Bf-blender-cvs] [0baa000b85c] master: Fix T73892: EEVEE Viewport Render Ignores Render As Wire

[Jeroen Bakker]

Commit: 0baa000b85c6107b71ca7a4e1abfc23406b69a9e
Author: Jeroen Bakker
Date:   Mon Jun 29 08:17:56 2020 +0200
Branches: master
https://developer.blender.org/rB0baa000b85c6107b71ca7a4e1abfc23406b69a9e

Fix T73892: EEVEE Viewport Render Ignores Render As Wire

In the viewport an object can be set to be displayed as wire. When
rendering the viewport this setting is ignored and follows the
path or doing a final render. This patch will add an exception
when rendering a viewport render.

Reviewed By: Clément Foucault

Differential Revision: https://developer.blender.org/D8043

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

M	source/blender/draw/engines/eevee/eevee_materials.c

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

diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c
index 29c8a183ae5..8537ad0e532 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -853,8 +853,7 @@ void EEVEE_materials_cache_populate(EEVEE_Data *vedata,
      */
     bool use_volume_material = (matcache[0].shading_gpumat &&
                                 GPU_material_has_volume_output(matcache[0].shading_gpumat));
-
-    if ((ob->dt >= OB_SOLID) || DRW_state_is_image_render()) {
+    if ((ob->dt >= OB_SOLID) || DRW_state_is_scene_render()) {
       if (use_sculpt_pbvh) {
         struct DRWShadingGroup **shgrps_array = BLI_array_alloca(shgrps_array, materials_len);