[Bf-blender-cvs] [8fe448b44d1] blender-v2.83-release: Fix T75197: Eevee does not render instanced smoke

Jacques Lucke noreply at git.blender.org
Wed May 20 16:57:16 CEST 2020


Commit: 8fe448b44d1dc8b5e62a293686704d6cb192d2fb
Author: Jacques Lucke
Date:   Wed May 20 16:55:43 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB8fe448b44d1dc8b5e62a293686704d6cb192d2fb

Fix T75197: Eevee does not render instanced smoke

This check was introduced in rBc8005703f298, but does not
seem necessary anymore.

Reviewers: fclem, sebbas, brecht

Differential Revision: https://developer.blender.org/D7799

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

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

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

diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c
index 63c96ac8c25..1c74003bf12 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 = modifiers_findByType(ob, eModifierType_Fluid)) &&
+  if ((md = modifiers_findByType(ob, eModifierType_Fluid)) &&
       (modifier_isEnabled(scene, md, eModifierMode_Realtime)) &&
       ((FluidModifierData *)md)->domain != NULL) {
     FluidModifierData *mmd = (FluidModifierData *)md;



More information about the Bf-blender-cvs mailing list