[Bf-blender-cvs] [a856c5eccff] master: Fix T67753 EEVEE: Crash using transparent shadows with default material

Clément Foucault noreply at git.blender.org
Mon Oct 7 22:16:57 CEST 2019


Commit: a856c5eccffba817a1e9ac499e0156fc6d4eb3c3
Author: Clément Foucault
Date:   Mon Oct 7 22:16:37 2019 +0200
Branches: master
https://developer.blender.org/rBa856c5eccffba817a1e9ac499e0156fc6d4eb3c3

Fix T67753 EEVEE: Crash using transparent shadows with default material

===================================================================

M	source/blender/draw/engines/eevee/eevee_materials.c

===================================================================

diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c
index f01c6363ccb..701d73461fc 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -1588,7 +1588,9 @@ void EEVEE_materials_cache_populate(EEVEE_Data *vedata,
 
           /* Shadow Pass */
           struct GPUMaterial *gpumat;
-          switch (ma_array[i]->blend_shadow) {
+          const bool use_gpumat = (ma_array[i]->use_nodes && ma_array[i]->nodetree);
+          char blend_shadow = use_gpumat ? ma_array[i]->blend_shadow : MA_BS_SOLID;
+          switch (blend_shadow) {
             case MA_BS_SOLID:
               EEVEE_shadows_caster_add(sldata, stl, mat_geom[i], ob);
               *cast_shadow = true;



More information about the Bf-blender-cvs mailing list