[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56953] trunk/blender/intern/smoke/intern/ FLUID_3D.cpp: Smoke: Remove accidental leftover code from gSoC Smoke + my Smoke code merge.

Daniel Genrich daniel.genrich at gmx.net
Tue May 21 21:52:22 CEST 2013


Revision: 56953
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56953
Author:   genscher
Date:     2013-05-21 19:52:22 +0000 (Tue, 21 May 2013)
Log Message:
-----------
Smoke: Remove accidental leftover code from gSoC Smoke + my Smoke code merge. 

Thanks to Miika for pointing this issue out and fixing it.

Modified Paths:
--------------
    trunk/blender/intern/smoke/intern/FLUID_3D.cpp

Modified: trunk/blender/intern/smoke/intern/FLUID_3D.cpp
===================================================================
--- trunk/blender/intern/smoke/intern/FLUID_3D.cpp	2013-05-21 19:20:48 UTC (rev 56952)
+++ trunk/blender/intern/smoke/intern/FLUID_3D.cpp	2013-05-21 19:52:22 UTC (rev 56953)
@@ -991,59 +991,11 @@
 				_pressure[index] = 0.0f;
 			}
 
-
-	/*
-	{
-		float maxvalue = 0;
-		for(unsigned int i = 0; i < _xRes * _yRes * _zRes; i++)
-		{
-			if(_divergence[i] > maxvalue)
-				maxvalue = _divergence[i];
-
-		}
-		printf("Max divergence: %f\n", maxvalue);
-	}
-	*/
-
 	copyBorderAll(_pressure, 0, _zRes);
 
-	/*
-	{
-		float maxvalue = 0;
-		for(unsigned int i = 0; i < _xRes * _yRes * _zRes; i++)
-		{
-			if(_pressure[i] > maxvalue)
-				maxvalue = _pressure[i];
-		}
-		printf("Max pressure BEFORE: %f\n", maxvalue);
-	}
-	*/
-
 	// solve Poisson equation
 	solvePressurePre(_pressure, _divergence, _obstacles);
 
-	{
-		float maxvalue = 0;
-		for(unsigned int i = 0; i < _xRes * _yRes * _zRes; i++)
-		{
-			if(_pressure[i] > maxvalue)
-				maxvalue = _pressure[i];
-
-			/* HACK: Animated collision object sometimes result in a non converging solvePressurePre() */ 
-			/*if(_pressure[i] > _dx * _dt)
-				_pressure[i] = _dx * _dt;
-			else if(_pressure[i] < -_dx * _dt)
-				_pressure[i] = -_dx * _dt;*/
-
-			// if(_obstacle[i] && _pressure[i] != 0.0)
-			// 	printf("BAD PRESSURE i\n");
-
-			// if(_pressure[i]>1)
-			// 	printf("index: %d\n", i);
-		}
-		// printf("Max pressure: %f, dx: %f\n", maxvalue, _dx);
-	}
-
 	setObstaclePressure(_pressure, 0, _zRes);
 
 	// project out solution




More information about the Bf-blender-cvs mailing list