From 02e318e8b9c40d00a5bfadc653bb55faf7da627e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Wed, 19 Jul 2017 18:15:27 +0200 Subject: [PATCH] Eevee: Fix crash when using lamps in dupli groups. --- source/blender/draw/engines/eevee/eevee_engine.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c index fe802e6d627..480bb1b12ad 100644 --- a/source/blender/draw/engines/eevee/eevee_engine.c +++ b/source/blender/draw/engines/eevee/eevee_engine.c @@ -108,10 +108,20 @@ static void EEVEE_cache_populate(void *vedata, Object *ob) } } else if (ob->type == OB_LIGHTPROBE) { - EEVEE_lightprobes_cache_add(sldata, ob); + if ((ob->base_flag & BASE_FROMDUPLI) != 0) { + /* TODO: Special case for dupli objects because we cannot save the object pointer. */ + } + else { + EEVEE_lightprobes_cache_add(sldata, ob); + } } else if (ob->type == OB_LAMP) { - EEVEE_lights_cache_add(sldata, ob); + if ((ob->base_flag & BASE_FROMDUPLI) != 0) { + /* TODO: Special case for dupli objects because we cannot save the object pointer. */ + } + else { + EEVEE_lights_cache_add(sldata, ob); + } } }