[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56669] trunk/blender/source/blender/ blenkernel/intern/smoke.c: Couple fixes for my previous commit:

[Miika Hamalainen]

Revision: 56669
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56669
Author:   miikah
Date:     2013-05-10 19:30:08 +0000 (Fri, 10 May 2013)
Log Message:
-----------
Couple fixes for my previous commit:
- In some cases smoke flow could have 1 cell clipped off its sides.
- Forgot to re-enable openmp for emission code.

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	2013-05-10 17:14:07 UTC (rev 56668)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c	2013-05-10 19:30:08 UTC (rev 56669)
@@ -1250,7 +1250,7 @@
 
 		float *vert_vel = NULL;
 		int has_velocity = 0;
-		float min[3], max[3], res[3];
+		int min[3], max[3], res[3];
 		int hires_multiplier = 1;
 
 		CDDM_calc_normals(dm);
@@ -1310,7 +1310,7 @@
 		}
 
 		/* set emission map */
-		clampBoundsInDomain(sds, em->min, em->max, NULL, NULL, sfs->surface_distance, dt);
+		clampBoundsInDomain(sds, em->min, em->max, NULL, NULL, (int)ceil(sfs->surface_distance), dt);
 		em_allocateData(em, sfs->flags & MOD_SMOKE_FLOW_INITVELOCITY, hires_multiplier);
 
 		/* setup loop bounds */
@@ -1321,7 +1321,7 @@
 		}
 
 		if (bvhtree_from_mesh_faces(&treeData, dm, 0.0f, 4, 6)) {
-			//#pragma omp parallel for schedule(static)
+			#pragma omp parallel for schedule(static)
 			for (z = min[2]; z < max[2]; z++) {
 				int x, y;
 				for (x = min[0]; x < max[0]; x++)