[Bf-blender-cvs] [25922e9] fluid-mantaflow: removed mesh scaling. better do this in smoke.c and keep cpp wrapper independent from mesh size

Sebastián Barschkis noreply at git.blender.org
Sun Jul 3 14:06:39 CEST 2016


Commit: 25922e9b1750578ef5c83bb213a1de59d8fd1e3f
Author: Sebastián Barschkis
Date:   Fri Jul 1 15:59:38 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB25922e9b1750578ef5c83bb213a1de59d8fd1e3f

removed mesh scaling. better do this in smoke.c and keep cpp wrapper independent from mesh size

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

M	intern/mantaflow/intern/SMOKE.cpp

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

diff --git a/intern/mantaflow/intern/SMOKE.cpp b/intern/mantaflow/intern/SMOKE.cpp
index b51d50e..ec91756 100644
--- a/intern/mantaflow/intern/SMOKE.cpp
+++ b/intern/mantaflow/intern/SMOKE.cpp
@@ -697,7 +697,6 @@ void* SMOKE::getGridPointer(std::string gridName, std::string solverName)
 void SMOKE::updateMeshData(const char* filename)
 {
 	gzFile gzf;
-	float dx =  1.0f / mMaxRes;
 	float fbuffer[3];
 	int ibuffer[3];
 
@@ -724,11 +723,6 @@ void SMOKE::updateMeshData(const char* filename)
 			mVerticesX[i] = fbuffer[0];
 			mVerticesY[i] = fbuffer[1];
 			mVerticesZ[i] = fbuffer[2];
-
-			// convert to grid space
-			mVerticesX[i] /= dx;
-			mVerticesY[i] /= dx;
-			mVerticesZ[i] /= dx;
 		}
 	}




More information about the Bf-blender-cvs mailing list