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/blenloader | |
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/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 126 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_250.c | 22 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_260.c | 70 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_270.c | 16 | ||||
-rw-r--r-- | source/blender/blenloader/intern/writefile.c | 36 |
5 files changed, 135 insertions, 135 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index e4822c4cb7f..1e855228875 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5285,18 +5285,18 @@ static void lib_link_object(BlendLibReader *reader, Object *ob) } { - FluidModifierData *mmd = (FluidModifierData *)BKE_modifiers_findby_type(ob, + FluidModifierData *fmd = (FluidModifierData *)BKE_modifiers_findby_type(ob, eModifierType_Fluid); - if (mmd && (mmd->type == MOD_FLUID_TYPE_DOMAIN) && mmd->domain) { + if (fmd && (fmd->type == MOD_FLUID_TYPE_DOMAIN) && fmd->domain) { /* Flag for refreshing the simulation after loading */ - mmd->domain->flags |= FLUID_DOMAIN_FILE_LOAD; + fmd->domain->flags |= FLUID_DOMAIN_FILE_LOAD; } - else if (mmd && (mmd->type == MOD_FLUID_TYPE_FLOW) && mmd->flow) { - mmd->flow->flags &= ~FLUID_FLOW_NEEDS_UPDATE; + else if (fmd && (fmd->type == MOD_FLUID_TYPE_FLOW) && fmd->flow) { + fmd->flow->flags &= ~FLUID_FLOW_NEEDS_UPDATE; } - else if (mmd && (mmd->type == MOD_FLUID_TYPE_EFFEC) && mmd->effector) { - mmd->effector->flags &= ~FLUID_EFFECTOR_NEEDS_UPDATE; + else if (fmd && (fmd->type == MOD_FLUID_TYPE_EFFEC) && fmd->effector) { + fmd->effector->flags &= ~FLUID_EFFECTOR_NEEDS_UPDATE; } } @@ -5589,42 +5589,42 @@ static void direct_link_modifiers(BlendDataReader *reader, ListBase *lb, Object } else if (md->type == eModifierType_Fluid) { - FluidModifierData *mmd = (FluidModifierData *)md; - - if (mmd->type == MOD_FLUID_TYPE_DOMAIN) { - mmd->flow = NULL; - mmd->effector = NULL; - BLO_read_data_address(reader, &mmd->domain); - mmd->domain->mmd = mmd; - - mmd->domain->fluid = NULL; - mmd->domain->fluid_mutex = BLI_rw_mutex_alloc(); - mmd->domain->tex_density = NULL; - mmd->domain->tex_color = NULL; - mmd->domain->tex_shadow = NULL; - mmd->domain->tex_flame = NULL; - mmd->domain->tex_flame_coba = NULL; - mmd->domain->tex_coba = NULL; - mmd->domain->tex_field = NULL; - mmd->domain->tex_velocity_x = NULL; - mmd->domain->tex_velocity_y = NULL; - mmd->domain->tex_velocity_z = NULL; - mmd->domain->tex_wt = NULL; - mmd->domain->mesh_velocities = NULL; - BLO_read_data_address(reader, &mmd->domain->coba); - - BLO_read_data_address(reader, &mmd->domain->effector_weights); - if (!mmd->domain->effector_weights) { - mmd->domain->effector_weights = BKE_effector_add_weights(NULL); + FluidModifierData *fmd = (FluidModifierData *)md; + + if (fmd->type == MOD_FLUID_TYPE_DOMAIN) { + fmd->flow = NULL; + fmd->effector = NULL; + BLO_read_data_address(reader, &fmd->domain); + fmd->domain->fmd = fmd; + + fmd->domain->fluid = NULL; + fmd->domain->fluid_mutex = BLI_rw_mutex_alloc(); + fmd->domain->tex_density = NULL; + fmd->domain->tex_color = NULL; + fmd->domain->tex_shadow = NULL; + fmd->domain->tex_flame = NULL; + fmd->domain->tex_flame_coba = NULL; + fmd->domain->tex_coba = NULL; + fmd->domain->tex_field = NULL; + fmd->domain->tex_velocity_x = NULL; + fmd->domain->tex_velocity_y = NULL; + fmd->domain->tex_velocity_z = NULL; + fmd->domain->tex_wt = NULL; + fmd->domain->mesh_velocities = NULL; + BLO_read_data_address(reader, &fmd->domain->coba); + + BLO_read_data_address(reader, &fmd->domain->effector_weights); + if (!fmd->domain->effector_weights) { + fmd->domain->effector_weights = BKE_effector_add_weights(NULL); } direct_link_pointcache_list( - reader, &(mmd->domain->ptcaches[0]), &(mmd->domain->point_cache[0]), 1); + reader, &(fmd->domain->ptcaches[0]), &(fmd->domain->point_cache[0]), 1); /* Manta sim uses only one cache from now on, so store pointer convert */ - if (mmd->domain->ptcaches[1].first || mmd->domain->point_cache[1]) { - if (mmd->domain->point_cache[1]) { - PointCache *cache = BLO_read_get_new_data_address(reader, mmd->domain->point_cache[1]); + if (fmd->domain->ptcaches[1].first || fmd->domain->point_cache[1]) { + if (fmd->domain->point_cache[1]) { + PointCache *cache = BLO_read_get_new_data_address(reader, fmd->domain->point_cache[1]); if (cache->flag & PTCACHE_FAKE_SMOKE) { /* Manta-sim/smoke was already saved in "new format" and this cache is a fake one. */ } @@ -5635,35 +5635,35 @@ static void direct_link_modifiers(BlendDataReader *reader, ListBase *lb, Object } BKE_ptcache_free(cache); } - BLI_listbase_clear(&mmd->domain->ptcaches[1]); - mmd->domain->point_cache[1] = NULL; + BLI_listbase_clear(&fmd->domain->ptcaches[1]); + fmd->domain->point_cache[1] = NULL; } } - else if (mmd->type == MOD_FLUID_TYPE_FLOW) { - mmd->domain = NULL; - mmd->effector = NULL; - BLO_read_data_address(reader, &mmd->flow); - mmd->flow->mmd = mmd; - mmd->flow->mesh = NULL; - mmd->flow->verts_old = NULL; - mmd->flow->numverts = 0; - BLO_read_data_address(reader, &mmd->flow->psys); - } - else if (mmd->type == MOD_FLUID_TYPE_EFFEC) { - mmd->flow = NULL; - mmd->domain = NULL; - BLO_read_data_address(reader, &mmd->effector); - if (mmd->effector) { - mmd->effector->mmd = mmd; - mmd->effector->verts_old = NULL; - mmd->effector->numverts = 0; - mmd->effector->mesh = NULL; + else if (fmd->type == MOD_FLUID_TYPE_FLOW) { + fmd->domain = NULL; + fmd->effector = NULL; + BLO_read_data_address(reader, &fmd->flow); + fmd->flow->fmd = fmd; + fmd->flow->mesh = NULL; + fmd->flow->verts_old = NULL; + fmd->flow->numverts = 0; + BLO_read_data_address(reader, &fmd->flow->psys); + } + else if (fmd->type == MOD_FLUID_TYPE_EFFEC) { + fmd->flow = NULL; + fmd->domain = NULL; + BLO_read_data_address(reader, &fmd->effector); + if (fmd->effector) { + fmd->effector->fmd = fmd; + fmd->effector->verts_old = NULL; + fmd->effector->numverts = 0; + fmd->effector->mesh = NULL; } else { - mmd->type = 0; - mmd->flow = NULL; - mmd->domain = NULL; - mmd->effector = NULL; + fmd->type = 0; + fmd->flow = NULL; + fmd->domain = NULL; + fmd->effector = NULL; } } } diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c index 2c3b047af46..3ed59a0baa1 100644 --- a/source/blender/blenloader/intern/versioning_250.c +++ b/source/blender/blenloader/intern/versioning_250.c @@ -1793,18 +1793,18 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Fluid) { - FluidModifierData *mmd = (FluidModifierData *)md; + FluidModifierData *fmd = (FluidModifierData *)md; - if ((mmd->type & MOD_FLUID_TYPE_DOMAIN) && mmd->domain) { - mmd->domain->vorticity = 2.0f; - mmd->domain->time_scale = 1.0f; + if ((fmd->type & MOD_FLUID_TYPE_DOMAIN) && fmd->domain) { + fmd->domain->vorticity = 2.0f; + fmd->domain->time_scale = 1.0f; - if (!(mmd->domain->flags & (1 << 4))) { + if (!(fmd->domain->flags & (1 << 4))) { continue; } /* delete old MOD_SMOKE_INITVELOCITY flag */ - mmd->domain->flags &= ~(1 << 4); + fmd->domain->flags &= ~(1 << 4); /* for now just add it to all flow objects in the scene */ { @@ -1813,18 +1813,18 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) ModifierData *md2; for (md2 = ob2->modifiers.first; md2; md2 = md2->next) { if (md2->type == eModifierType_Fluid) { - FluidModifierData *mmd2 = (FluidModifierData *)md2; + FluidModifierData *fmd2 = (FluidModifierData *)md2; - if ((mmd2->type & MOD_FLUID_TYPE_FLOW) && mmd2->flow) { - mmd2->flow->flags |= FLUID_FLOW_INITVELOCITY; + if ((fmd2->type & MOD_FLUID_TYPE_FLOW) && fmd2->flow) { + fmd2->flow->flags |= FLUID_FLOW_INITVELOCITY; } } } } } } - else if ((mmd->type & MOD_FLUID_TYPE_FLOW) && mmd->flow) { - mmd->flow->vel_multi = 1.0f; + else if ((fmd->type & MOD_FLUID_TYPE_FLOW) && fmd->flow) { + fmd->flow->vel_multi = 1.0f; } } } 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; } } } diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c index 496c8353f85..521fc4b9b82 100644 --- a/source/blender/blenloader/intern/versioning_270.c +++ b/source/blender/blenloader/intern/versioning_270.c @@ -1470,11 +1470,11 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) for (ob = bmain->objects.first; ob; ob = ob->id.next) { for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Fluid) { - FluidModifierData *mmd = (FluidModifierData *)md; - if (mmd->domain) { - mmd->domain->slice_per_voxel = 5.0f; - mmd->domain->slice_depth = 0.5f; - mmd->domain->display_thickness = 1.0f; + FluidModifierData *fmd = (FluidModifierData *)md; + if (fmd->domain) { + fmd->domain->slice_per_voxel = 5.0f; + fmd->domain->slice_depth = 0.5f; + fmd->domain->display_thickness = 1.0f; } } } @@ -1640,9 +1640,9 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain) for (ob = bmain->objects.first; ob; ob = ob->id.next) { for (md = ob->modifiers.first; md; md = md->next) { if (md->type == eModifierType_Fluid) { - FluidModifierData *mmd = (FluidModifierData *)md; - if (mmd->domain) { - mmd->domain->clipping = 1e-3f; + FluidModifierData *fmd = (FluidModifierData *)md; + if (fmd->domain) { + fmd->domain->clipping = 1e-3f; } } } diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 4e0325e72fa..2ce8abff3c5 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -1670,37 +1670,37 @@ static void write_modifiers(BlendWriter *writer, ListBase *modbase) write_pointcaches(writer, &clmd->ptcaches); } else if (md->type == eModifierType_Fluid) { - FluidModifierData *mmd = (FluidModifierData *)md; + FluidModifierData *fmd = (FluidModifierData *)md; - if (mmd->type & MOD_FLUID_TYPE_DOMAIN) { - BLO_write_struct(writer, FluidDomainSettings, mmd->domain); + if (fmd->type & MOD_FLUID_TYPE_DOMAIN) { + BLO_write_struct(writer, FluidDomainSettings, fmd->domain); - if (mmd->domain) { - write_pointcaches(writer, &(mmd->domain->ptcaches[0])); + if (fmd->domain) { + write_pointcaches(writer, &(fmd->domain->ptcaches[0])); /* create fake pointcache so that old blender versions can read it */ - mmd->domain->point_cache[1] = BKE_ptcache_add(&mmd->domain->ptcaches[1]); - mmd->domain->point_cache[1]->flag |= PTCACHE_DISK_CACHE | PTCACHE_FAKE_SMOKE; - mmd->domain->point_cache[1]->step = 1; + fmd->domain->point_cache[1] = BKE_ptcache_add(&fmd->domain->ptcaches[1]); + fmd->domain->point_cache[1]->flag |= PTCACHE_DISK_CACHE | PTCACHE_FAKE_SMOKE; + fmd->domain->point_cache[1]->step = 1; - write_pointcaches(writer, &(mmd->domain->ptcaches[1])); + write_pointcaches(writer, &(fmd->domain->ptcaches[1])); - if (mmd->domain->coba) { - BLO_write_struct(writer, ColorBand, mmd->domain->coba); + if (fmd->domain->coba) { + BLO_write_struct(writer, ColorBand, fmd->domain->coba); } /* cleanup the fake pointcache */ - BKE_ptcache_free_list(&mmd->domain->ptcaches[1]); - mmd->domain->point_cache[1] = NULL; + BKE_ptcache_free_list(&fmd->domain->ptcaches[1]); + fmd->domain->point_cache[1] = NULL; - BLO_write_struct(writer, EffectorWeights, mmd->domain->effector_weights); + BLO_write_struct(writer, EffectorWeights, fmd->domain->effector_weights); } } - else if (mmd->type & MOD_FLUID_TYPE_FLOW) { - BLO_write_struct(writer, FluidFlowSettings, mmd->flow); + else if (fmd->type & MOD_FLUID_TYPE_FLOW) { + BLO_write_struct(writer, FluidFlowSettings, fmd->flow); } - else if (mmd->type & MOD_FLUID_TYPE_EFFEC) { - BLO_write_struct(writer, FluidEffectorSettings, mmd->effector); + else if (fmd->type & MOD_FLUID_TYPE_EFFEC) { + BLO_write_struct(writer, FluidEffectorSettings, fmd->effector); } } else if (md->type == eModifierType_Fluidsim) { |