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 <j.bakker@atmind.nl>2018-05-29 13:06:48 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2018-05-29 13:06:48 +0300
commit643259415dc5eea78bfac0fbaa5b148b39932a17 (patch)
treeca8b1d6bc09e9753064b28dbca995f3130c44347 /source/blender/draw/engines/eevee/eevee_lookdev.c
parenta0b08e7b66fe9b271874d2f97d588d936d2d50f2 (diff)
EEVEE: LookDev fade out background option
Diffstat (limited to 'source/blender/draw/engines/eevee/eevee_lookdev.c')
-rw-r--r--source/blender/draw/engines/eevee/eevee_lookdev.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_lookdev.c b/source/blender/draw/engines/eevee/eevee_lookdev.c
index e92cbe76472..80d3ff711af 100644
--- a/source/blender/draw/engines/eevee/eevee_lookdev.c
+++ b/source/blender/draw/engines/eevee/eevee_lookdev.c
@@ -36,7 +36,7 @@ void EEVEE_lookdev_cache_init(EEVEE_Data *vedata, DRWShadingGroup **grp, GPUShad
EEVEE_StorageList *stl = vedata->stl;
const DRWContextState *draw_ctx = DRW_context_state_get();
View3D *v3d = draw_ctx->v3d;
- if (v3d && v3d->drawtype == OB_MATERIAL)
+ if (LOOK_DEV_MODE_ENABLED(v3d))
{
StudioLight *sl = BKE_studiolight_find(v3d->shading.studio_light, STUDIOLIGHT_ORIENTATION_WORLD);
if ((sl->flag & STUDIOLIGHT_ORIENTATION_WORLD)) {
@@ -61,6 +61,10 @@ void EEVEE_lookdev_cache_init(EEVEE_Data *vedata, DRWShadingGroup **grp, GPUShad
pinfo->prev_wo_sh_compiled = false;
pinfo->prev_world = NULL;
}
+ else {
+ /* Do not fadeout when doing probe rendering, only when drawing the background */
+ DRW_shgroup_uniform_float(*grp, "studioLightFadeout", &v3d->shading.studiolight_fadeout, 1);
+ }
}
}
}