[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48492] trunk/blender/intern/smoke/intern/ FLUID_3D.cpp: Smoke Bugfix: Turbulence was removed.

[Daniel Genrich]

Revision: 48492
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48492
Author:   genscher
Date:     2012-07-02 13:41:51 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
Smoke Bugfix: Turbulence was removed.

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	2012-07-02 12:55:23 UTC (rev 48491)
+++ trunk/blender/intern/smoke/intern/FLUID_3D.cpp	2012-07-02 13:41:51 UTC (rev 48492)
@@ -1298,7 +1298,7 @@
 					N[2] = (_vorticity[out] - _vorticity[in]) * dz;
 
 					float magnitude = sqrtf(N[0] * N[0] + N[1] * N[1] + N[2] * N[2]);
-					if (magnitude > 0.0f)
+					if (magnitude > FLT_EPSILON)
 					{
 						magnitude = 1.0f / magnitude;
 						N[0] *= magnitude;
@@ -1306,8 +1306,8 @@
 						N[2] *= magnitude;
 
 						_xForce[index] += (N[1] * _zVorticity[vIndex] - N[2] * _yVorticity[vIndex]) * _dx * eps;
-						_yForce[index] += (N[0] * _zVorticity[vIndex] - N[2] * _xVorticity[vIndex]) * _dx * eps;
-						_zForce[index] -= (N[0] * _yVorticity[vIndex] - N[1] * _xVorticity[vIndex]) * _dx * eps;
+						_yForce[index] += (N[2] * _xVorticity[vIndex] - N[0] * _zVorticity[vIndex]) * _dx * eps;
+						_zForce[index] += (N[0] * _yVorticity[vIndex] - N[1] * _xVorticity[vIndex]) * _dx * eps;
 					}
 					}	// if
 					vIndex++;