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.

1 files changed, 35 insertions, 35 deletions

diff --git a/source/blender/blenloader/intern/versioning_260.c b/source/blender/blenloader/intern/versioning_260.c
index 98e10bef470..b3bf8991c3e 100644
--- a/source/blender/blenloader/intern/versioning_260.c
+++ b/source/blender/blenloader/intern/versioning_260.c
@@ -1310,11 +1310,11 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
       ModifierData *md;
       for (md = ob->modifiers.first; md; md = md->next) {
         if (md->type == eModifierType_Fluid) {
-          FluidModifierData *mmd = (FluidModifierData *)md;
-          if ((mmd->type & MOD_FLUID_TYPE_DOMAIN) && mmd->domain) {
-            int maxres = max_iii(mmd->domain->res[0], mmd->domain->res[1], mmd->domain->res[2]);
-            mmd->domain->scale = mmd->domain->dx * maxres;
-            mmd->domain->dx = 1.0f / mmd->domain->scale;
+          FluidModifierData *fmd = (FluidModifierData *)md;
+          if ((fmd->type & MOD_FLUID_TYPE_DOMAIN) && fmd->domain) {
+            int maxres = max_iii(fmd->domain->res[0], fmd->domain->res[1], fmd->domain->res[2]);
+            fmd->domain->scale = fmd->domain->dx * maxres;
+            fmd->domain->dx = 1.0f / fmd->domain->scale;
           }
         }
       }
@@ -1628,30 +1628,30 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
         ModifierData *md;
         for (md = ob->modifiers.first; md; md = md->next) {
           if (md->type == eModifierType_Fluid) {
-            FluidModifierData *mmd = (FluidModifierData *)md;
-            if ((mmd->type & MOD_FLUID_TYPE_DOMAIN) && mmd->domain) {
+            FluidModifierData *fmd = (FluidModifierData *)md;
+            if ((fmd->type & MOD_FLUID_TYPE_DOMAIN) && fmd->domain) {
               /* keep branch saves if possible */
-              if (!mmd->domain->flame_max_temp) {
-                mmd->domain->burning_rate = 0.75f;
-                mmd->domain->flame_smoke = 1.0f;
-                mmd->domain->flame_vorticity = 0.5f;
-                mmd->domain->flame_ignition = 1.25f;
-                mmd->domain->flame_max_temp = 1.75f;
-                mmd->domain->adapt_threshold = 0.02f;
-                mmd->domain->adapt_margin = 4;
-                mmd->domain->flame_smoke_color[0] = 0.7f;
-                mmd->domain->flame_smoke_color[1] = 0.7f;
-                mmd->domain->flame_smoke_color[2] = 0.7f;
+              if (!fmd->domain->flame_max_temp) {
+                fmd->domain->burning_rate = 0.75f;
+                fmd->domain->flame_smoke = 1.0f;
+                fmd->domain->flame_vorticity = 0.5f;
+                fmd->domain->flame_ignition = 1.25f;
+                fmd->domain->flame_max_temp = 1.75f;
+                fmd->domain->adapt_threshold = 0.02f;
+                fmd->domain->adapt_margin = 4;
+                fmd->domain->flame_smoke_color[0] = 0.7f;
+                fmd->domain->flame_smoke_color[1] = 0.7f;
+                fmd->domain->flame_smoke_color[2] = 0.7f;
               }
             }
-            else if ((mmd->type & MOD_FLUID_TYPE_FLOW) && mmd->flow) {
-              if (!mmd->flow->texture_size) {
-                mmd->flow->fuel_amount = 1.0;
-                mmd->flow->surface_distance = 1.5;
-                mmd->flow->color[0] = 0.7f;
-                mmd->flow->color[1] = 0.7f;
-                mmd->flow->color[2] = 0.7f;
-                mmd->flow->texture_size = 1.0f;
+            else if ((fmd->type & MOD_FLUID_TYPE_FLOW) && fmd->flow) {
+              if (!fmd->flow->texture_size) {
+                fmd->flow->fuel_amount = 1.0;
+                fmd->flow->surface_distance = 1.5;
+                fmd->flow->color[0] = 0.7f;
+                fmd->flow->color[1] = 0.7f;
+                fmd->flow->color[2] = 0.7f;
+                fmd->flow->texture_size = 1.0f;
               }
             }
           }
@@ -2158,13 +2158,13 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
       ModifierData *md;
       for (md = ob->modifiers.first; md; md = md->next) {
         if (md->type == eModifierType_Fluid) {
-          FluidModifierData *mmd = (FluidModifierData *)md;
-          if ((mmd->type & MOD_FLUID_TYPE_DOMAIN) && mmd->domain) {
-            if (mmd->domain->flags & FLUID_DOMAIN_USE_HIGH_SMOOTH) {
-              mmd->domain->highres_sampling = SM_HRES_LINEAR;
+          FluidModifierData *fmd = (FluidModifierData *)md;
+          if ((fmd->type & MOD_FLUID_TYPE_DOMAIN) && fmd->domain) {
+            if (fmd->domain->flags & FLUID_DOMAIN_USE_HIGH_SMOOTH) {
+              fmd->domain->highres_sampling = SM_HRES_LINEAR;
             }
             else {
-              mmd->domain->highres_sampling = SM_HRES_NEAREST;
+              fmd->domain->highres_sampling = SM_HRES_NEAREST;
             }
           }
         }
@@ -2225,10 +2225,10 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
       ModifierData *md;
       for (md = ob->modifiers.first; md; md = md->next) {
         if (md->type == eModifierType_Fluid) {
-          FluidModifierData *mmd = (FluidModifierData *)md;
-          if ((mmd->type & MOD_FLUID_TYPE_FLOW) && mmd->flow) {
-            if (!mmd->flow->particle_size) {
-              mmd->flow->particle_size = 1.0f;
+          FluidModifierData *fmd = (FluidModifierData *)md;
+          if ((fmd->type & MOD_FLUID_TYPE_FLOW) && fmd->flow) {
+            if (!fmd->flow->particle_size) {
+              fmd->flow->particle_size = 1.0f;
             }
           }
         }