← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to intern/elbeem/intern/ntl_world.cpp

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2012-04-28 12:11:12 UTC
  • mto: (14.1.6 experimental) (1.5.1)
  • mto: This revision was merged to the branch mainline in revision 34.
  • Revision ID: package-import@ubuntu.com-20120428121112-2zi0vp8b6vejda8i
Tags: upstream-2.63
Import upstream version 2.63

Show diffs side-by-side

added added

removed removed

Lines of Context:
intern/elbeem/intern/ntl_world.cpp
400
400
        bool done = false;
401
401
        bool allPanic = true;
402
402
 
403
 
        // stop/quit, dont display/render
404
 
        if(getElbeemState()==SIMWORLD_STOP) { 
 
403
        // stop/quit (abort), dont display/render
 
404
        if(!isSimworldOk()) { 
405
405
                return 1;
406
406
        }
407
407
 
411
411
        // time stopped? nothing else to do...
412
412
        if( (*mpSims)[mFirstSim]->getFrameTime(framenum) <= 0.0 ){ 
413
413
                done=true; allPanic=false; 
 
414
 
 
415
                /* DG: Need to check for user cancel here (fix for [#30298]) */
 
416
                (*mpSims)[mFirstSim]->checkCallerStatus(FLUIDSIM_CBSTATUS_STEP, 0);
414
417
        }
415
418
 
416
419
        int gstate = 0;