Commit: 10bf1d9ac1a40379bda2883d82beb320a8c99c82
Author: Clément Foucault
Date: Mon Apr 15 17:46:06 2019 +0200
Branches: master
https://developer.blender.org/rB10bf1d9ac1a40379bda2883d82beb320a8c99c82
Fix T63284: Eevee: Crash when subsurface pass is enabled
Was caused by a NULL texture used as uniform.
===================================================================
M source/blender/draw/engines/eevee/eevee_subsurface.c
===================================================================
diff --git a/source/blender/draw/engines/eevee/eevee_subsurface.c
b/source/blender/draw/engines/eevee/eevee_subsurface.c
index 8abbaa64fd2..fe8c2f1e107 100644
--- a/source/blender/draw/engines/eevee/eevee_subsurface.c
+++ b/source/blender/draw/engines/eevee/eevee_subsurface.c
@@ -253,11 +253,14 @@ void EEVEE_subsurface_add_pass(
DRW_shgroup_uniform_texture(grp, "utilTex",
EEVEE_materials_get_util_tex());
DRW_shgroup_uniform_texture_ref(grp, "depthBuffer", depth_src);
DRW_shgroup_uniform_texture_ref(grp, "sssData",
&effects->sss_blur);
- DRW_shgroup_uniform_texture_ref(grp, "sssAlbedo",
&effects->sss_albedo);
DRW_shgroup_uniform_block(grp, "sssProfile", sss_profile);
DRW_shgroup_uniform_block(grp, "common_block",
sldata->common_ubo);
DRW_shgroup_stencil_mask(grp, sss_id);
DRW_shgroup_call_add(grp, quad, NULL);
+
+ if (effects->sss_separate_albedo) {
+ DRW_shgroup_uniform_texture_ref(grp, "sssAlbedo",
&effects->sss_albedo);
+ }
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
