diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-05-20 23:56:09 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2020-05-20 23:56:09 +0300 |
| commit | 8a0840b0ee9a60a62bf6d1f800d08bf852427fd5 (patch) | |
| tree | 80344f42e0483345eef48796380dc7e5f229463b /source/blender/draw/engines/eevee/eevee_volumes.c | |
| parent | 71fa4601452756f3b4a26b51ec44f13edbf2e9a8 (diff) | |
| parent | af3a55bb1b7d11c3036839d66fcf4280f1dae96b (diff) | |
Merge branch 'blender-v2.83-release'
# Conflicts:
# source/blender/draw/engines/eevee/eevee_volumes.c
Diffstat (limited to 'source/blender/draw/engines/eevee/eevee_volumes.c')
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_volumes.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c index ad90c52b08e..83bd4fcf8d2 100644 --- a/source/blender/draw/engines/eevee/eevee_volumes.c +++ b/source/blender/draw/engines/eevee/eevee_volumes.c @@ -486,8 +486,7 @@ static bool eevee_volume_object_mesh_init(Scene *scene, ModifierData *md = NULL; /* Smoke Simulation */ - if (((ob->base_flag & BASE_FROM_DUPLI) == 0) && - (md = BKE_modifiers_findby_type(ob, eModifierType_Fluid)) && + if ((md = BKE_modifiers_findby_type(ob, eModifierType_Fluid)) && (BKE_modifier_is_enabled(scene, md, eModifierMode_Realtime)) && ((FluidModifierData *)md)->domain != NULL) { FluidModifierData *mmd = (FluidModifierData *)md; |