diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2020-03-03 11:58:48 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2020-03-12 11:27:28 +0300 |
| commit | 456595fd39c2db59be9de4652c7232a04d2322b6 (patch) | |
| tree | 0bc24a147b4f8197f3c092a7570154670dc88cd0 /source/blender/draw/engines/eevee/eevee_private.h | |
| parent | 0c0895e3e679a22c7bb3674a43c9e020e23c93d6 (diff) | |
Fix T74392: HDRI preview spheres appear in render passes and reflections
Do not render HDRI Previews when a renderpass is active
Reviewed By: fclem
Differential Revision: https://developer.blender.org/D7005
Diffstat (limited to 'source/blender/draw/engines/eevee/eevee_private.h')
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_private.h | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h index 4f5ab5f2e1f..0f084ba306b 100644 --- a/source/blender/draw/engines/eevee/eevee_private.h +++ b/source/blender/draw/engines/eevee/eevee_private.h @@ -125,9 +125,21 @@ extern struct DrawEngineType draw_engine_eevee_type; } \ ((void)0) -#define LOOK_DEV_OVERLAY_ENABLED(v3d) \ - ((v3d) && (v3d->shading.type == OB_MATERIAL) && ((v3d->flag2 & V3D_HIDE_OVERLAYS) == 0) && \ - (v3d->overlay.flag & V3D_OVERLAY_LOOK_DEV)) +BLI_INLINE bool eevee_hdri_preview_overlay_enabled(View3D *v3d) +{ + /* Only show the HDRI Preview in Shading Preview in the Viewport. */ + if (v3d == NULL || v3d->shading.type != OB_MATERIAL) { + return false; + } + + /* Only show the HDRI Preview when viewing the Combined render pass */ + if (v3d->shading.render_pass != SCE_PASS_COMBINED) { + return false; + } + + return ((v3d->flag2 & V3D_HIDE_OVERLAYS) == 0) && (v3d->overlay.flag & V3D_OVERLAY_LOOK_DEV); +} + #define USE_SCENE_LIGHT(v3d) \ ((!v3d) || \ ((v3d->shading.type == OB_MATERIAL) && (v3d->shading.flag & V3D_SHADING_SCENE_LIGHTS)) || \ |