Commit: 329f128f23740a7cae3770671f12f68ad081a86b
Author: Sebastián Barschkis
Date: Sun Mar 20 23:26:43 2016 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rB329f128f23740a7cae3770671f12f68ad081a86b
now deleting python grid references properly
===================================================================
M intern/mantaflow/intern/MANTA.cpp
M intern/mantaflow/intern/MANTA.h
===================================================================
diff --git a/intern/mantaflow/intern/MANTA.cpp
b/intern/mantaflow/intern/MANTA.cpp
index cb6e61e..bd810a7 100644
--- a/intern/mantaflow/intern/MANTA.cpp
+++ b/intern/mantaflow/intern/MANTA.cpp
@@ -250,7 +250,53 @@ void MANTA::step(SmokeModifierData *smd)
MANTA::~MANTA()
{
std::cout << "~MANTA()" << std::endl;
-
+
+ // Decrease reference count of Python objects.
+ // Reason: Some Python objects are also referenced in this class
+ // Note: All grids from updatePointers() have to be handled here!
+ Py_DECREF( getPythonObject("density") );
+ Py_DECREF( getPythonObject("x_vel") );
+ Py_DECREF( getPythonObject("y_vel") );
+ Py_DECREF( getPythonObject("z_vel") );
+ Py_DECREF( getPythonObject("inflow_grid") );
+ Py_DECREF( getPythonObject("fuel_inflow") );
+
+ if (mHeat)
+ Py_DECREF( getPythonObject("heat") );
+
+ if (mFuel)
+ {
+ Py_DECREF( getPythonObject("flame") );
+ Py_DECREF( getPythonObject("fuel") );
+ Py_DECREF( getPythonObject("react") );
+ }
+
+ if (mColorR)
+ {
+ Py_DECREF( getPythonObject("color_r") );
+ Py_DECREF( getPythonObject("color_g") );
+ Py_DECREF( getPythonObject("color_b") );
+ }
+
+ if (mUsingHighRes)
+ {
+ Py_DECREF( getPythonObject("xl_density") );
+
+ if (mFuel)
+ {
+ Py_DECREF( getPythonObject("xl_flame") );
+ Py_DECREF( getPythonObject("xl_fuel") );
+ Py_DECREF( getPythonObject("xl_react") );
+ }
+
+ if (mColorR)
+ {
+ Py_DECREF( getPythonObject("xl_color_r") );
+ Py_DECREF( getPythonObject("xl_color_g") );
+ Py_DECREF( getPythonObject("xl_color_b") );
+ }
+ }
+
// Destruction in Python
mCommands.clear();
mCommands.push_back(del_vars_low);
@@ -264,10 +310,24 @@ MANTA::~MANTA()
if (mUsingHighRes) mCommands.push_back(del_vars_high);
runPythonString(mCommands);
- // TODO
- // Reset pointers in this to avoid dangling pointers
-
-
+ // Reset pointers to avoid dangling pointers
+ mDensity = NULL;
+ mHeat = NULL;
+ mVelocityX = NULL;
+ mVelocityY = NULL;
+ mVelocityZ = NULL;
+ mForceX = NULL;
+ mForceY = NULL;
+ mForceZ = NULL;
+ mFlame = NULL;
+ mFuel = NULL;
+ mReact = NULL;
+ mColorR = NULL;
+ mColorG = NULL;
+ mColorB = NULL;
+ mDensityInflow = NULL;
+ mFuelInflow = NULL;
+ mMantaFlags = NULL;
if (mObVelocityX) delete[] mObVelocityX; // TODO in
Mantaflow
if (mObVelocityY) delete[] mObVelocityY; // TODO in
Mantaflow
if (mObVelocityZ) delete[] mObVelocityZ; // TODO in
Mantaflow
@@ -276,6 +336,14 @@ MANTA::~MANTA()
if (mUsingHighRes)
{
+ mDensityHigh = NULL;
+ mFlameHigh = NULL;
+ mFuelHigh = NULL;
+ mReactHigh = NULL;
+ mColorRHigh = NULL;
+ mColorGHigh = NULL;
+ mColorBHigh = NULL;
+
if (mTextureU) delete[] mTextureU; // TODO in
Mantaflow
if (mTextureV) delete[] mTextureV; // TODO in
Mantaflow
if (mTextureW) delete[] mTextureW; // TODO in
Mantaflow
@@ -538,6 +606,17 @@ void MANTA::exportGrids(SmokeModifierData *smd)
PyGILState_Release(gilstate);
}
+PyObject* MANTA::getPythonObject(std::string pyVariableName)
+{
+ if (pyVariableName == "") return NULL;
+
+ PyGILState_STATE gilstate = PyGILState_Ensure();
+ PyObject* main = PyImport_AddModule("__main__");
+ PyObject* globals = PyModule_GetDict(main);
+ PyObject* pyObject = PyDict_GetItemString(globals,
pyVariableName.c_str());
+ PyGILState_Release(gilstate);
+ return pyObject;
+}
string MANTA::getGridPointer(std::string gridName, std::string solverName)
{
@@ -574,7 +653,9 @@ void MANTA::updatePointers(SmokeModifierData *smd)
{
std::cout << "Updating pointers low res" << std::endl;
mDensity = (float*) pointerFromString( getGridPointer("density",
"s") );
- mMantaFlags = (int*) pointerFromString( getGridPointer("flags",
"s") );
+ mVelocityX = (float*) pointerFromString( getGridPointer("x_vel",
"s") );
+ mVelocityY = (float*) pointerFromString( getGridPointer("y_vel",
"s") );
+ mVelocityZ = (float*) pointerFromString( getGridPointer("z_vel",
"s") );
mDensityInflow = (float*) pointerFromString(
getGridPointer("inflow_grid","s") );
mFuelInflow = (float*) pointerFromString(
getGridPointer("fuel_inflow","s") );
@@ -591,10 +672,6 @@ void MANTA::updatePointers(SmokeModifierData *smd)
mColorG = (float*) pointerFromString(
getGridPointer("color_g", "s") );
mColorB = (float*) pointerFromString(
getGridPointer("color_b", "s") );
}
-
- mVelocityX = (float*) pointerFromString( getGridPointer("x_vel",
"s") );
- mVelocityY = (float*) pointerFromString( getGridPointer("y_vel",
"s") );
- mVelocityZ = (float*) pointerFromString( getGridPointer("z_vel",
"s") );
}
void MANTA::updatePointersHigh(SmokeModifierData *smd)
diff --git a/intern/mantaflow/intern/MANTA.h b/intern/mantaflow/intern/MANTA.h
index c6083ad..c27b49a 100644
--- a/intern/mantaflow/intern/MANTA.h
+++ b/intern/mantaflow/intern/MANTA.h
@@ -183,6 +183,8 @@ private:
std::string parseScript(const string& setup_string, SmokeModifierData
*smd);
std::string getGridPointer(std::string gridName, std::string
solverName);
void* pointerFromString(const std::string& s);
+ PyObject* getPythonObject(std::string pyVariableName);
+
};
#endif
\ No newline at end of file
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
