[Bf-blender-cvs] [8a0840b0ee9] master: Merge branch 'blender-v2.83-release'

[Clément Foucault]

Commit: 8a0840b0ee9a60a62bf6d1f800d08bf852427fd5
Author: Clément Foucault
Date:   Wed May 20 22:56:09 2020 +0200
Branches: master
https://developer.blender.org/rB8a0840b0ee9a60a62bf6d1f800d08bf852427fd5

Merge branch 'blender-v2.83-release'

# Conflicts:
#	source/blender/draw/engines/eevee/eevee_volumes.c

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



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

diff --cc source/blender/draw/engines/eevee/eevee_volumes.c
index ad90c52b08e,1c74003bf12..83bd4fcf8d2
--- a/source/blender/draw/engines/eevee/eevee_volumes.c
+++ b/source/blender/draw/engines/eevee/eevee_volumes.c
@@@ -486,9 -486,8 +486,8 @@@ static bool eevee_volume_object_mesh_in
    ModifierData *md = NULL;
  
    /* Smoke Simulation */
-   if (((ob->base_flag & BASE_FROM_DUPLI) == 0) &&
-       (md = BKE_modifiers_findby_type(ob, eModifierType_Fluid)) &&
 -  if ((md = modifiers_findByType(ob, eModifierType_Fluid)) &&
 -      (modifier_isEnabled(scene, md, eModifierMode_Realtime)) &&
++  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;
      FluidDomainSettings *mds = mmd->domain;