[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33319] trunk/blender/source/blender/ blenkernel/intern/smoke.c: Smoke domain resolutions were calculated wrong for non-cube domains in some cases .

[Janne Karhu]

Revision: 33319
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33319
Author:   jhk
Date:     2010-11-25 23:13:40 +0100 (Thu, 25 Nov 2010)

Log Message:
-----------
Smoke domain resolutions were calculated wrong for non-cube domains in some cases.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/smoke.c

Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/smoke.c	2010-11-25 21:59:12 UTC (rev 33318)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c	2010-11-25 22:13:40 UTC (rev 33319)
@@ -177,7 +177,7 @@
 
 		if(size[0] > size[1])
 		{
-			if(size[0] > size[1])
+			if(size[0] > size[2])
 			{
 				scale = res / size[0];
 				smd->domain->dx = size[0] / res;
@@ -187,11 +187,11 @@
 			}
 			else
 			{
-				scale = res / size[1];
-				smd->domain->dx = size[1] / res;
-				smd->domain->res[1] = res;
+				scale = res / size[2];
+				smd->domain->dx = size[2] / res;
+				smd->domain->res[2] = res;
 				smd->domain->res[0] = (int)(size[0] * scale + 0.5);
-				smd->domain->res[2] = (int)(size[2] * scale + 0.5);
+				smd->domain->res[1] = (int)(size[1] * scale + 0.5);
 			}
 		}
 		else