diff options
author | Philipp Oeser <info@graphics-engineer.com> | 2021-05-25 17:27:34 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2021-06-09 09:41:42 +0300 |
commit | b38eb310509620cc460bb4ea3b25a01665a4d30b (patch) | |
tree | 1f303cacb3c54accf519f182e753c145d9c1d655 /source/blender | |
parent | 8eef2f83e9aae1887816bfa6b8ca572b46e0be65 (diff) |
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
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/fluid.c | 3 |
1 files changed, 2 insertions, 1 deletions
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, |