blender
/
blender
130
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Fluid: Fixes for new abort bake faster feature 

In addition to previous commit that made it possible to abort bakes faster.
This commit is contained in:
Sebastián Barschkis 2020-03-17 16:11:12 +01:00
parent b852db57ba
commit 20456b52b4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/blenkernel/intern/fluid.c
View File

@ -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(