diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2018-05-29 10:08:32 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2018-05-29 10:08:32 +0300 |
| commit | 77e32e88198b9d40854b085c82fab36e7a87f6a5 (patch) | |
| tree | fa146b64ab6dd8a9f63f555355523f8be6183e05 /source/blender/draw | |
| parent | 6946c413402c05a838e98a3823bf926df8cfe8d1 (diff) | |
EEVEE: LookDev overlays enabling
The mirror ball and diffuse ball are only rendered when overlays are
turned on and the lookdev overlay is turned on.
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_lookdev.c | 2 | ||||
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_private.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_lookdev.c b/source/blender/draw/engines/eevee/eevee_lookdev.c index 4ae13669a01..e92cbe76472 100644 --- a/source/blender/draw/engines/eevee/eevee_lookdev.c +++ b/source/blender/draw/engines/eevee/eevee_lookdev.c @@ -74,7 +74,7 @@ void EEVEE_lookdev_draw_background(EEVEE_Data *vedata) const DRWContextState *draw_ctx = DRW_context_state_get(); - if (psl->lookdev_pass && draw_ctx->v3d) { + if (psl->lookdev_pass && LOOK_DEV_OVERLAY_ENABLED(draw_ctx->v3d)) { DRW_stats_group_start("Look Dev"); CameraParams params; BKE_camera_params_init(¶ms); diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h index 10a53db5e35..52497b492fc 100644 --- a/source/blender/draw/engines/eevee/eevee_private.h +++ b/source/blender/draw/engines/eevee/eevee_private.h @@ -92,6 +92,9 @@ extern struct DrawEngineType draw_engine_eevee_type; } \ } ((void)0) +#define OVERLAY_ENABLED(v3d) ((v3d) && (v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) +#define LOOK_DEV_OVERLAY_ENABLED(v3d) (OVERLAY_ENABLED(v3d) && ((v3d->overlay.flag & V3D_OVERLAY_LOOK_DEV) > 0)) + /* World shader variations */ enum { VAR_WORLD_BACKGROUND = 0, |