[Bf-blender-cvs] [b5fa065165a] fluid-mantaflow: enabled raw mesh pointer normalization

[Sebastián Barschkis]

Commit: b5fa065165afa74a62232654fbb420162317e051
Author: Sebastián Barschkis
Date:   Mon May 7 19:00:31 2018 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBb5fa065165afa74a62232654fbb420162317e051

enabled raw mesh pointer normalization

===================================================================

M	source/blender/blenkernel/intern/smoke.c

===================================================================

diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 39766b13049..f1541d5ffa2 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -2930,18 +2930,17 @@ static DerivedMesh *createLiquidMesh(SmokeDomainSettings *sds, DerivedMesh *orgd
 		mverts->co[1] = liquid_get_vertex_y_at(sds->fluid, i);
 		mverts->co[2] = liquid_get_vertex_z_at(sds->fluid, i);
 
-		// TODO (sebbas): Allow mesh creation with raw data from manta mesh? Then we need this normalization
-//		// if reading raw data directly from manta, normalize now
-//		if ((sds->cache_flag & FLUID_CACHE_BAKED_MESH) == 0)
-//		{
-//			// normalize to unit cube around 0
-//			mverts->co[0] -= ((float) sds->res[0]*sds->mesh_scale)*0.5f;
-//			mverts->co[1] -= ((float) sds->res[1]*sds->mesh_scale)*0.5f;
-//			mverts->co[2] -= ((float) sds->res[2]*sds->mesh_scale)*0.5f;
-//			mverts->co[0] *= sds->dx / sds->mesh_scale;
-//			mverts->co[1] *= sds->dx / sds->mesh_scale;
-//			mverts->co[2] *= sds->dx / sds->mesh_scale;
-//		}
+		// if reading raw data directly from manta, normalize now
+		if ((sds->cache_flag & FLUID_CACHE_BAKED_MESH) == 0)
+		{
+			// normalize to unit cube around 0
+			mverts->co[0] -= ((float) sds->res[0]*sds->mesh_scale)*0.5f;
+			mverts->co[1] -= ((float) sds->res[1]*sds->mesh_scale)*0.5f;
+			mverts->co[2] -= ((float) sds->res[2]*sds->mesh_scale)*0.5f;
+			mverts->co[0] *= sds->dx / sds->mesh_scale;
+			mverts->co[1] *= sds->dx / sds->mesh_scale;
+			mverts->co[2] *= sds->dx / sds->mesh_scale;
+		}
 
 		mverts->co[0] *= max_size / fabsf(ob->size[0]);
 		mverts->co[1] *= max_size / fabsf(ob->size[1]);