diff options
author | Daniel Genrich <daniel.genrich@gmx.net> | 2012-04-22 21:31:39 +0400 |
---|---|---|
committer | Daniel Genrich <daniel.genrich@gmx.net> | 2012-04-22 21:31:39 +0400 |
commit | a164aa1ab6c23e068bb4c136609fc09a1347f990 (patch) | |
tree | 83d6b6ecfe55e6281b559d8e5e7367e6fb98b9ac /intern/elbeem | |
parent | ff06260ea1db70cd8f6e0247d9105bf1b12f891f (diff) |
Bugfix [#30298] Fluid-Sytem does not work! (Part 2, Part 1 fixed by Brecht)
Canceling fluid simulation did not work when speed was zero.
Diffstat (limited to 'intern/elbeem')
-rw-r--r-- | intern/elbeem/intern/ntl_world.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/intern/elbeem/intern/ntl_world.cpp b/intern/elbeem/intern/ntl_world.cpp index 42ee94b2cf5..3b649c9f5b9 100644 --- a/intern/elbeem/intern/ntl_world.cpp +++ b/intern/elbeem/intern/ntl_world.cpp @@ -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; |