diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2017-07-19 19:15:27 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2017-07-19 19:17:56 +0300 |
commit | 02e318e8b9c40d00a5bfadc653bb55faf7da627e (patch) | |
tree | 4a2142f9fa75e41c07cfac090a144dd422da6b15 /source | |
parent | 2382f979e206189b9efe14968771ef7f3bfba9dd (diff) |
Eevee: Fix crash when using lamps in dupli groups.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_engine.c | 14 |
1 files 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); + } } } |