archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T74392: HDRI preview spheres appear in render passes and reflections

Browse Source 
Do not render HDRI Previews when a renderpass is active

Reviewed By: fclem

Differential Revision: https://developer.blender.org/D7005
This commit is contained in:
Jeroen Bakker
2020-03-03 09:58:48 +01:00
parent 0c0895e3e6
commit 456595fd39
4 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/draw/engines/eevee/eevee_private.h
View File

@@ -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)) || \