Bugfix [#30298] Fluid-Sytem does not work! (Part 2, Part 1 fixed by Brecht)

Canceling fluid simulation did not work when speed was zero.
This commit is contained in:
2012-04-22 17:31:39 +00:00
parent ff06260ea1
commit a164aa1ab6

View File

@@ -400,8 +400,8 @@ int ntlWorld::advanceSims(int framenum)
bool done = false;
bool allPanic = true;
// stop/quit, dont display/render
if(getElbeemState()==SIMWORLD_STOP) {
// stop/quit (abort), dont display/render
if(!isSimworldOk()) {
return 1;
}
@@ -411,6 +411,9 @@ int ntlWorld::advanceSims(int framenum)
// time stopped? nothing else to do...
if( (*mpSims)[mFirstSim]->getFrameTime(framenum) <= 0.0 ){
done=true; allPanic=false;
/* DG: Need to check for user cancel here (fix for [#30298]) */
(*mpSims)[mFirstSim]->checkCallerStatus(FLUIDSIM_CBSTATUS_STEP, 0);
}
int gstate = 0;