[Bf-blender-cvs] [a59e9cd] fluid-mantaflow: removed some deprecated functions

[Sebastián Barschkis]

Commit: a59e9cd9f636647b063caabc8c155fe81a03f768
Author: Sebastián Barschkis
Date:   Sat Apr 23 13:48:01 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBa59e9cd9f636647b063caabc8c155fe81a03f768

removed some deprecated functions

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

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 9e1f17c..9bded17 100644
--- a/intern/mantaflow/intern/MANTA.cpp
+++ b/intern/mantaflow/intern/MANTA.cpp
@@ -596,21 +596,6 @@ 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* pyObject = PyObject_GetAttrString(main, pyVariableName.c_str());
-
-	Py_DECREF(pyObject);
-
-	PyGILState_Release(gilstate);
-	return pyObject;
-}
-
 void* MANTA::getGridPointer(std::string gridName, std::string solverName)
 {
 	if ((gridName == "") && (solverName == "")) return NULL;
@@ -639,14 +624,6 @@ void* MANTA::getGridPointer(std::string gridName, std::string solverName)
 	return gridPointer;
 }
 
-void* MANTA::pointerFromString(const std::string& s)
-{
-	std::stringstream ss(s);
-	void *gridPointer = NULL;
-	ss >> gridPointer;
-	return gridPointer;
-}
-
 void MANTA::updatePointers(SmokeModifierData *smd)
 {
 	std::cout << "Updating pointers low res" << std::endl;
diff --git a/intern/mantaflow/intern/MANTA.h b/intern/mantaflow/intern/MANTA.h
index bacb6e5..f55d39e 100644
--- a/intern/mantaflow/intern/MANTA.h
+++ b/intern/mantaflow/intern/MANTA.h
@@ -178,9 +178,6 @@ private:
 	std::string parseLine(const std::string& line, SmokeModifierData *smd);
 	std::string parseScript(const std::string& setup_string, SmokeModifierData *smd);
 	void* 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