[Bf-blender-cvs] [b813007a0f6] master: Fix T88566: Mantaflow inflow with shapekeys is not working anymore (regression)

Philipp Oeser noreply at git.blender.org
Wed May 26 10:20:06 CEST 2021


Commit: b813007a0f658cf7949f8b642bcdac75cc4a1dc2
Author: Philipp Oeser
Date:   Tue May 25 16:27:34 2021 +0200
Branches: master
https://developer.blender.org/rBb813007a0f658cf7949f8b642bcdac75cc4a1dc2

Fix T88566: Mantaflow inflow with shapekeys is not working anymore
(regression)

Code was actually checking for shapekeys, but these were not detected
properly (some effects like shape keys are added as virtual modifiers
before the user created modifiers)

Now go over virtual modifiers as well.

Maniphest Tasks: T88566

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

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

M	source/blender/blenkernel/intern/fluid.c

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

diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c
index 851d8aae378..1cd5c30c2dd 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -623,7 +623,8 @@ static void clamp_bounds_in_domain(FluidDomainSettings *fds,
 static bool is_static_object(Object *ob)
 {
   /* Check if the object has modifiers that might make the object "dynamic". */
-  ModifierData *md = ob->modifiers.first;
+  VirtualModifierData virtualModifierData;
+  ModifierData *md = BKE_modifiers_get_virtual_modifierlist(ob, &virtualModifierData);
   for (; md; md = md->next) {
     if (ELEM(md->type,
              eModifierType_Cloth,



More information about the Bf-blender-cvs mailing list