diff options
| author | Sebastián Barschkis <sebbas@sebbas.org> | 2020-03-17 18:11:12 +0300 |
|---|---|---|
| committer | Sebastián Barschkis <sebbas@sebbas.org> | 2020-03-17 18:12:46 +0300 |
| commit | 20456b52b47965b2d4ee5d9fc831ff8d821e0007 (patch) | |
| tree | b400ad39d56cddeb3495305e0b0161c38ec7142f /source/blender/blenkernel/intern/fluid.c | |
| parent | b852db57ba24adfcfaa0ada7e9ff513a79a399a2 (diff) | |
Fluid: Fixes for new abort bake faster feature
In addition to previous commit that made it possible to abort bakes faster.
Diffstat (limited to 'source/blender/blenkernel/intern/fluid.c')
| -rw-r--r-- | source/blender/blenkernel/intern/fluid.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c index 2a94b56b68c..797e03e015a 100644 --- a/source/blender/blenkernel/intern/fluid.c +++ b/source/blender/blenkernel/intern/fluid.c @@ -3535,6 +3535,8 @@ static int manta_step( /* Store baking success - bake might be aborted anytime by user. */ int result = 1; + int mode = mds->cache_type; + bool mode_replay = (mode == FLUID_DOMAIN_CACHE_REPLAY); /* Update object state. */ invert_m4_m4(mds->imat, ob->obmat); @@ -3571,7 +3573,7 @@ static int manta_step( update_flowsfluids(depsgraph, scene, ob, mds, time_per_frame, frame_length, frame, dt); /* If user requested stop, quit baking */ - if (G.is_break) { + if (G.is_break && !mode_replay) { result = 0; break; } @@ -3582,7 +3584,7 @@ static int manta_step( update_obstacles(depsgraph, scene, ob, mds, time_per_frame, frame_length, frame, dt); /* If user requested stop, quit baking */ - if (G.is_break) { + if (G.is_break && !mode_replay) { result = 0; break; } @@ -3596,7 +3598,7 @@ static int manta_step( } /* If user requested stop, quit baking */ - if (G.is_break) { + if (G.is_break && !mode_replay) { result = 0; break; } @@ -3995,7 +3997,6 @@ static void BKE_fluid_modifier_processDomain(FluidModifierData *mmd, } } mmd->time = scene_framenr; - G.is_break = false; } static void BKE_fluid_modifier_process( |