diff options
author | Sebastián Barschkis <sebbas@sebbas.org> | 2020-07-03 12:51:15 +0300 |
---|---|---|
committer | Sebastián Barschkis <sebbas@sebbas.org> | 2020-07-03 12:52:08 +0300 |
commit | b1d3850333adfe36c6ff94b8307fdafc9cc5148c (patch) | |
tree | 28b8bbff0a25ccb6c4ef4f98aefc36a196a25a0f /source/blender/blenkernel/intern/object.c | |
parent | 868d6ba1a70edd7e49bd40191547e2537ae76973 (diff) |
Cleanup: Fluid renaming from old 'manta' naming to new 'fluid' naming
Changed variable names from mmd, mds, mfs, and mes to fmd, fds, ffs, and fes. The author of this commits lights a candle for all the merge conflicts this will cause.
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 5dc7a06cd6b..6331f87f09f 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1532,12 +1532,12 @@ void BKE_object_copy_particlesystems(Object *ob_dst, const Object *ob_src, const } } else if (md->type == eModifierType_Fluid) { - FluidModifierData *mmd = (FluidModifierData *)md; + FluidModifierData *fmd = (FluidModifierData *)md; - if (mmd->type == MOD_FLUID_TYPE_FLOW) { - if (mmd->flow) { - if (mmd->flow->psys == psys) { - mmd->flow->psys = npsys; + if (fmd->type == MOD_FLUID_TYPE_FLOW) { + if (fmd->flow) { + if (fmd->flow->psys == psys) { + fmd->flow->psys = npsys; } } } @@ -4592,9 +4592,9 @@ bool BKE_object_modifier_update_subframe(Depsgraph *depsgraph, } } else if (type == eModifierType_Fluid) { - FluidModifierData *mmd = (FluidModifierData *)md; + FluidModifierData *fmd = (FluidModifierData *)md; - if (mmd && (mmd->type & MOD_FLUID_TYPE_DOMAIN) != 0) { + if (fmd && (fmd->type & MOD_FLUID_TYPE_DOMAIN) != 0) { return true; } } |