Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <jbakker>2020-06-29 09:17:56 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2020-06-29 09:19:14 +0300
commit0baa000b85c6107b71ca7a4e1abfc23406b69a9e (patch)
tree84ed7684dc3044fb189c3ab2aae5ca5593fcf1c7 /source/blender/draw/engines
parent3b630bd563b65cb43fc2c3b61213d14ad68b8eb4 (diff)
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
Diffstat (limited to 'source/blender/draw/engines')
-rw-r--r--source/blender/draw/engines/eevee/eevee_materials.c3
1 files changed, 1 insertions, 2 deletions
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);