[Bf-blender-cvs] [5bcd39d] fluid-mantaflow: removed high res getter for flags grid

Sebastián Barschkis noreply at git.blender.org
Mon Dec 5 09:48:11 CET 2016


Commit: 5bcd39da48dec7bbf29bfe6098b5055139c76739
Author: Sebastián Barschkis
Date:   Sun Dec 4 18:12:39 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB5bcd39da48dec7bbf29bfe6098b5055139c76739

removed high res getter for flags grid

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

M	intern/mantaflow/extern/manta_fluid_API.h
M	intern/mantaflow/intern/FLUID.cpp
M	intern/mantaflow/intern/FLUID.h
M	intern/mantaflow/intern/manta_fluid_API.cpp

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

diff --git a/intern/mantaflow/extern/manta_fluid_API.h b/intern/mantaflow/extern/manta_fluid_API.h
index a2ab4d5..5ae96a1 100644
--- a/intern/mantaflow/extern/manta_fluid_API.h
+++ b/intern/mantaflow/extern/manta_fluid_API.h
@@ -89,7 +89,6 @@ void smoke_ensure_fire(struct FLUID *smoke, struct SmokeModifierData *smd);
 void smoke_ensure_colors(struct FLUID *smoke, struct SmokeModifierData *smd);
 float *smoke_get_inflow_grid(struct FLUID *smoke);
 float *smoke_get_fuel_inflow(struct FLUID *smoke);
-int *smoke_turbulence_get_obstacle(struct FLUID *smoke);
 
 float *liquid_get_phiin(struct FLUID *liquid);
 float *liquid_get_phiobs(struct FLUID *liquid);
diff --git a/intern/mantaflow/intern/FLUID.cpp b/intern/mantaflow/intern/FLUID.cpp
index 8b0dce2..874f505 100644
--- a/intern/mantaflow/intern/FLUID.cpp
+++ b/intern/mantaflow/intern/FLUID.cpp
@@ -939,8 +939,6 @@ void FLUID::updatePointers(SmokeModifierData *smd)
 void FLUID::updatePointersHigh(SmokeModifierData *smd)
 {
 	std::cout << "Updating pointers high res" << std::endl;
-	
-	mObstacleHigh = (int*) getGridPointer("xl_flags", "s");
 
 	// Liquid
 	if (mUsingLiquid) {
diff --git a/intern/mantaflow/intern/FLUID.h b/intern/mantaflow/intern/FLUID.h
index 5051fd8..77fd871 100644
--- a/intern/mantaflow/intern/FLUID.h
+++ b/intern/mantaflow/intern/FLUID.h
@@ -121,7 +121,6 @@ public:
 	inline float* getTextureU2() { return mTextureU2; }
 	inline float* getTextureV2() { return mTextureV2; }
 	inline float* getTextureW2() { return mTextureW2; }
-	inline int* getObstacleHigh() { return mObstacleHigh; }
 	
 	inline float* getPhiIn()  { return mPhiIn; }
 	inline float* getPhiObs() { return mPhiObs; }
@@ -210,7 +209,6 @@ private:
 	float* mTextureU2;
 	float* mTextureV2;
 	float* mTextureW2;
-	int* mObstacleHigh;
 	
 	// Liquids
 	float* mPhiIn;
diff --git a/intern/mantaflow/intern/manta_fluid_API.cpp b/intern/mantaflow/intern/manta_fluid_API.cpp
index b5c2a3b..e161bc9 100644
--- a/intern/mantaflow/intern/manta_fluid_API.cpp
+++ b/intern/mantaflow/intern/manta_fluid_API.cpp
@@ -353,11 +353,6 @@ extern "C" float *smoke_turbulence_get_density(FLUID *smoke)
 	return (smoke && smoke->usingHighRes()) ? smoke->getDensityHigh() : NULL;
 }
 
-extern "C" int *smoke_turbulence_get_obstacle(FLUID *smoke)
-{
-	return (smoke && smoke->usingHighRes()) ? smoke->getObstacleHigh() : NULL;
-}
-
 extern "C" float *smoke_turbulence_get_fuel(FLUID *smoke)
 {
 	return (smoke && smoke->usingHighRes()) ? smoke->getFuelHigh() : NULL;




More information about the Bf-blender-cvs mailing list