[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46941] branches/smoke2/intern/smoke/ intern/FLUID_3D.cpp: Fix matrix typos, still not working though

[Daniel Genrich]

Revision: 46941
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46941
Author:   genscher
Date:     2012-05-23 16:10:43 +0000 (Wed, 23 May 2012)
Log Message:
-----------
Fix matrix typos, still not working though

Modified Paths:
--------------
    branches/smoke2/intern/smoke/intern/FLUID_3D.cpp

Modified: branches/smoke2/intern/smoke/intern/FLUID_3D.cpp
===================================================================
--- branches/smoke2/intern/smoke/intern/FLUID_3D.cpp	2012-05-23 14:28:41 UTC (rev 46940)
+++ branches/smoke2/intern/smoke/intern/FLUID_3D.cpp	2012-05-23 16:10:43 UTC (rev 46941)
@@ -917,16 +917,16 @@
 			{
 				if(!_obstacles[INDEX(x, y, z)])
 				{
-					if(_obstacles[INDEX(x + 1, y, z)]) A0[INDEX(x, y, z)] += scale;
-					if(_obstacles[INDEX(x - 1, y, z)]) A0[INDEX(x, y, z)] += scale;
-					if(_obstacles[INDEX(x, y + 1, z)]) A0[INDEX(x, y, z)] += scale;
-					if(_obstacles[INDEX(x, y - 1, z)]) A0[INDEX(x, y, z)] += scale;
-					if(_obstacles[INDEX(x, y, z + 1)]) A0[INDEX(x, y, z)] += scale;
-					if(_obstacles[INDEX(x, y, z - 1)]) A0[INDEX(x, y, z)] += scale;
+					if(!_obstacles[INDEX(x + 1, y, z)]) A0[INDEX(x, y, z)] += scale;
+					if(!_obstacles[INDEX(x - 1, y, z)]) A0[INDEX(x, y, z)] += scale;
+					if(!_obstacles[INDEX(x, y + 1, z)]) A0[INDEX(x, y, z)] += scale;
+					if(!_obstacles[INDEX(x, y - 1, z)]) A0[INDEX(x, y, z)] += scale;
+					if(!_obstacles[INDEX(x, y, z + 1)]) A0[INDEX(x, y, z)] += scale;
+					if(!_obstacles[INDEX(x, y, z - 1)]) A0[INDEX(x, y, z)] += scale;
 
-					if(_obstacles[INDEX(x + 1, y, z)]) Ai[INDEX(x, y, z)] = -scale;
-					if(_obstacles[INDEX(x, y + 1, z)]) Aj[INDEX(x, y, z)] = -scale;
-					if(_obstacles[INDEX(x, y, z + 1)]) Ak[INDEX(x, y, z)] = -scale;
+					if(!_obstacles[INDEX(x + 1, y, z)]) Ai[INDEX(x, y, z)] = -scale;
+					if(!_obstacles[INDEX(x, y + 1, z)]) Aj[INDEX(x, y, z)] = -scale;
+					if(!_obstacles[INDEX(x, y, z + 1)]) Ak[INDEX(x, y, z)] = -scale;
 				}
 
 			}