diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-03-15 13:46:18 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-03-15 13:46:18 +0300 |
| commit | 80edc0e972a2dde85509968832ce21f46d86ce58 (patch) | |
| tree | 157c35a309108bcd564211dc2dc5833a2231b643 /source/blender/blenkernel/intern/fluid.c | |
| parent | aa60b9338ab679853d36322829458ccb7b4f06d0 (diff) | |
Cleanup: redundant assignments
Diffstat (limited to 'source/blender/blenkernel/intern/fluid.c')
| -rw-r--r-- | source/blender/blenkernel/intern/fluid.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c index fc29b4aae32..934dc47cf81 100644 --- a/source/blender/blenkernel/intern/fluid.c +++ b/source/blender/blenkernel/intern/fluid.c @@ -3742,10 +3742,9 @@ static void BKE_fluid_modifier_processDomain(FluidModifierData *mmd, baking_mesh = mds->cache_flag & FLUID_DOMAIN_BAKING_MESH; baking_particles = mds->cache_flag & FLUID_DOMAIN_BAKING_PARTICLES; baking_guide = mds->cache_flag & FLUID_DOMAIN_BAKING_GUIDE; - bake_outdated = mds->cache_flag & - (FLUID_DOMAIN_OUTDATED_DATA | FLUID_DOMAIN_OUTDATED_NOISE | - FLUID_DOMAIN_OUTDATED_NOISE | FLUID_DOMAIN_OUTDATED_MESH | - FLUID_DOMAIN_OUTDATED_PARTICLES | FLUID_DOMAIN_OUTDATED_GUIDE); + bake_outdated = mds->cache_flag & (FLUID_DOMAIN_OUTDATED_DATA | FLUID_DOMAIN_OUTDATED_NOISE | + FLUID_DOMAIN_OUTDATED_MESH | FLUID_DOMAIN_OUTDATED_PARTICLES | + FLUID_DOMAIN_OUTDATED_GUIDE); bool resume_data, resume_noise, resume_mesh, resume_particles, resume_guide; resume_data = (!is_startframe) && (mds->cache_frame_pause_data == scene_framenr); @@ -4896,7 +4895,6 @@ void BKE_fluid_modifier_create_type_data(struct FluidModifierData *mmd) mmd->flow->type = FLUID_FLOW_TYPE_SMOKE; mmd->flow->behavior = FLUID_FLOW_BEHAVIOR_GEOMETRY; - mmd->flow->type = FLUID_FLOW_TYPE_SMOKE; mmd->flow->flags = FLUID_FLOW_ABSOLUTE | FLUID_FLOW_USE_PART_SIZE | FLUID_FLOW_USE_INFLOW; } else if (mmd->type & MOD_FLUID_TYPE_EFFEC) { |