diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2018-05-29 11:59:37 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2018-05-29 12:01:25 +0300 |
| commit | a0b08e7b66fe9b271874d2f97d588d936d2d50f2 (patch) | |
| tree | 1167373f73b086d3ab5f690e16ee039a7bfe3aa7 /source/blender/draw | |
| parent | 2bb4977c4a85c78b8844e47d32c54ccf8e2d7613 (diff) | |
EEVEE: LookDev use_scene_light draw option
Scene lights are rendered when
- v3d is not available
- or shading type is other then OB_MATERIAL
- or shading type is OB_MATERIAL and use_scene_light is true
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_engine.c | 3 | ||||
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_materials.c | 2 | ||||
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_private.h | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c index f6776d43665..1e43a244f04 100644 --- a/source/blender/draw/engines/eevee/eevee_engine.c +++ b/source/blender/draw/engines/eevee/eevee_engine.c @@ -148,6 +148,9 @@ static void eevee_cache_populate(void *vedata, Object *ob) EEVEE_lights_cache_shcaster_object_add(sldata, ob); } } + else if (!USE_SCENE_LIGHT(draw_ctx->v3d)) { + /* do not add any light sources to the cache */ + } else if (ob->type == OB_LIGHTPROBE) { if ((ob->base_flag & BASE_FROMDUPLI) != 0) { /* TODO: Special case for dupli objects because we cannot save the object pointer. */ diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c index 1134c82954c..cbbb1d6f6b1 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.c +++ b/source/blender/draw/engines/eevee/eevee_materials.c @@ -1633,7 +1633,7 @@ void EEVEE_materials_cache_finish(EEVEE_Data *vedata) /* Look-Dev */ const DRWContextState *draw_ctx = DRW_context_state_get(); const View3D *v3d = draw_ctx->v3d; - if (v3d && v3d->drawtype == OB_MATERIAL) { + if (LOOK_DEV_OVERLAY_ENABLED(v3d)) { EEVEE_ViewLayerData *sldata = EEVEE_view_layer_data_ensure(); EEVEE_LampsInfo *linfo = sldata->lamps; struct Gwn_Batch *sphere = DRW_cache_sphere_get(); diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h index 52497b492fc..d57f6464ec1 100644 --- a/source/blender/draw/engines/eevee/eevee_private.h +++ b/source/blender/draw/engines/eevee/eevee_private.h @@ -93,7 +93,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)) +#define LOOK_DEV_MODE_ENABLED(v3d) ((v3d) && (v3d->drawtype == OB_MATERIAL)) +#define LOOK_DEV_OVERLAY_ENABLED(v3d) (LOOK_DEV_MODE_ENABLED(v3d) && OVERLAY_ENABLED(v3d) && ((v3d->overlay.flag & V3D_OVERLAY_LOOK_DEV) > 0)) +#define USE_SCENE_LIGHT(v3d) ((!v3d) || (!LOOK_DEV_MODE_ENABLED(v3d)) || ((LOOK_DEV_MODE_ENABLED(v3d) && (v3d->shading.flag & V3D_SHADING_SCENE_LIGHT)))) /* World shader variations */ enum { |