diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-09-30 02:49:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-09-30 02:49:33 +0400 |
| commit | 8b6f5c171da4d9b165c5ba0628f0302430dbed2b (patch) | |
| tree | 143760eb8bfb151e6bea7fc5fdaed0fafe221a49 /source/gameengine/Converter/KX_ConvertControllers.cpp | |
| parent | 71b3088596feb008e503be6430a30555aaffa586 (diff) | |
- rather then passing the python namespace dictionary to the controller function get the namespace from the converter.
- renamed SetPythonDictionary() to SetPyNamespace()
- remove IsLight(), GetGameObjectType() existed before this but wasnt used for lights.
Diffstat (limited to 'source/gameengine/Converter/KX_ConvertControllers.cpp')
| -rw-r--r-- | source/gameengine/Converter/KX_ConvertControllers.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/gameengine/Converter/KX_ConvertControllers.cpp b/source/gameengine/Converter/KX_ConvertControllers.cpp index 1cb15c932ac..faef0feaf48 100644 --- a/source/gameengine/Converter/KX_ConvertControllers.cpp +++ b/source/gameengine/Converter/KX_ConvertControllers.cpp @@ -92,9 +92,6 @@ void BL_ConvertControllers( struct Object* blenderobject, class KX_GameObject* gameobj, SCA_LogicManager* logicmgr, -#ifndef DISABLE_PYTHON - PyObject* pythondictionary, -#endif int activeLayerBitInfo, bool isInActiveLayer, KX_BlenderSceneConverter* converter @@ -160,10 +157,9 @@ void BL_ConvertControllers( bPythonCont* pycont = (bPythonCont*) bcontr->data; SCA_PythonController* pyctrl = new SCA_PythonController(gameobj, pycont->mode); gamecontroller = pyctrl; - #ifndef DISABLE_PYTHON - pyctrl->SetDictionary(pythondictionary); + pyctrl->SetNamespace(converter->GetPyNamespace()); if(pycont->mode==SCA_PythonController::SCA_PYEXEC_SCRIPT) { if (pycont->text) |