[Bf-blender-cvs] [6fe495f] fluid-mantaflow: added liquid ensure function

Sebastián Barschkis noreply at git.blender.org
Wed Jun 8 00:27:49 CEST 2016


Commit: 6fe495f564a5342b9b2d6c7354288d614694f213
Author: Sebastián Barschkis
Date:   Sat Jun 4 14:28:01 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB6fe495f564a5342b9b2d6c7354288d614694f213

added liquid ensure function

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

M	intern/mantaflow/extern/manta_smoke_API.h
M	intern/mantaflow/intern/manta_smoke_API.cpp

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

diff --git a/intern/mantaflow/extern/manta_smoke_API.h b/intern/mantaflow/extern/manta_smoke_API.h
index eef9ef2..442e0b8 100644
--- a/intern/mantaflow/extern/manta_smoke_API.h
+++ b/intern/mantaflow/extern/manta_smoke_API.h
@@ -89,6 +89,8 @@ float *smoke_get_inflow_grid(struct SMOKE *smoke);
 float *smoke_get_fuel_inflow(struct SMOKE *smoke);
 
 float *liquid_get_phi(struct SMOKE *liquid);
+void liquid_ensure_init(struct SMOKE *smoke, struct SmokeModifierData *smd);
+
 
 #ifdef __cplusplus
 }
diff --git a/intern/mantaflow/intern/manta_smoke_API.cpp b/intern/mantaflow/intern/manta_smoke_API.cpp
index c356aa4..9342570 100644
--- a/intern/mantaflow/intern/manta_smoke_API.cpp
+++ b/intern/mantaflow/intern/manta_smoke_API.cpp
@@ -469,6 +469,14 @@ extern "C" void smoke_ensure_colors(SMOKE *smoke, struct SmokeModifierData *smd)
 	}
 }
 
+extern "C" void liquid_ensure_init(SMOKE *smoke, struct SmokeModifierData *smd)
+{
+	if (smoke) {
+		smoke->initLiquid(smd);
+		smoke->updatePointers(smd);
+	}
+}
+
 extern "C" float *smoke_get_inflow_grid(SMOKE *smoke)
 {
 	return smoke->getDensityInflow();




More information about the Bf-blender-cvs mailing list