diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-08-02 19:03:47 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2018-08-02 19:33:49 +0300 |
| commit | 3578212e462d2a67f49d64ce5fb64df43200654f (patch) | |
| tree | 90c1f4fc7bcda986231efd71909c5f75ef48c5ce /source/blender/draw/engines/eevee/eevee_lookdev.c | |
| parent | ce551ada928100e34b13e2ea8a6304d0631ec3e6 (diff) | |
Eevee: Fix missing UBO binds.
Some of them are unecessary and should be removed from the shader instead.
But for now we need a quick fix for the crashes happening on some platforms.
See T55475.
Diffstat (limited to 'source/blender/draw/engines/eevee/eevee_lookdev.c')
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_lookdev.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_lookdev.c b/source/blender/draw/engines/eevee/eevee_lookdev.c index 345a28590c6..deb724c9ae6 100644 --- a/source/blender/draw/engines/eevee/eevee_lookdev.c +++ b/source/blender/draw/engines/eevee/eevee_lookdev.c @@ -112,18 +112,14 @@ void EEVEE_lookdev_cache_init( if (!pinfo) { /* Do not fadeout when doing probe rendering, only when drawing the background */ DRW_shgroup_uniform_float(*grp, "studioLightBackground", &v3d->shading.studiolight_background, 1); - if (v3d->shading.studiolight_background > 0.0f) { - BKE_studiolight_ensure_flag(sl, STUDIOLIGHT_EQUIRECTANGULAR_IRRADIANCE_GPUTEXTURE); - tex = sl->equirectangular_irradiance_gputexture; - } + BKE_studiolight_ensure_flag(sl, STUDIOLIGHT_EQUIRECTANGULAR_IRRADIANCE_GPUTEXTURE); + tex = sl->equirectangular_irradiance_gputexture; } else { BKE_studiolight_ensure_flag(sl, STUDIOLIGHT_EQUIRECTANGULAR_RADIANCE_GPUTEXTURE); tex = sl->equirectangular_radiance_gputexture; } - if (tex != NULL) { - DRW_shgroup_uniform_texture(*grp, "image", tex); - } + DRW_shgroup_uniform_texture(*grp, "image", tex); /* Do we need to recalc the lightprobes? */ if (pinfo && |