[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45853] trunk/blender/intern/elbeem/intern /ntl_world.cpp: Bugfix [#30298] Fluid-Sytem does not work! (Part 2, Part 1 fixed by Brecht)

Daniel Genrich daniel.genrich at gmx.net
Sun Apr 22 19:31:40 CEST 2012


Revision: 45853
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45853
Author:   genscher
Date:     2012-04-22 17:31:39 +0000 (Sun, 22 Apr 2012)
Log Message:
-----------
Bugfix [#30298] Fluid-Sytem does not work! (Part 2, Part 1 fixed by Brecht)

Canceling fluid simulation did not work when speed was zero.

Modified Paths:
--------------
    trunk/blender/intern/elbeem/intern/ntl_world.cpp

Modified: trunk/blender/intern/elbeem/intern/ntl_world.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/ntl_world.cpp	2012-04-22 16:21:00 UTC (rev 45852)
+++ trunk/blender/intern/elbeem/intern/ntl_world.cpp	2012-04-22 17:31:39 UTC (rev 45853)
@@ -400,8 +400,8 @@
 	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 @@
 	// 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;




More information about the Bf-blender-cvs mailing list