rename and negate DISABLE_PYTHON --> WITH_PYTHON
This commit is contained in:
@@ -35,10 +35,10 @@
|
||||
#include "SCA_IActuator.h"
|
||||
#include "PyObjectPlus.h"
|
||||
|
||||
#ifndef DISABLE_PYTHON
|
||||
#ifdef WITH_PYTHON
|
||||
#include "compile.h"
|
||||
#include "eval.h"
|
||||
#endif // DISABLE_PYTHON
|
||||
#endif // WITH_PYTHON
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
@@ -49,7 +49,7 @@ SCA_PythonController* SCA_PythonController::m_sCurrentController = NULL;
|
||||
|
||||
SCA_PythonController::SCA_PythonController(SCA_IObject* gameobj, int mode)
|
||||
: SCA_IController(gameobj),
|
||||
#ifndef DISABLE_PYTHON
|
||||
#ifdef WITH_PYTHON
|
||||
m_bytecode(NULL),
|
||||
m_function(NULL),
|
||||
#endif
|
||||
@@ -57,7 +57,7 @@ SCA_PythonController::SCA_PythonController(SCA_IObject* gameobj, int mode)
|
||||
m_bModified(true),
|
||||
m_debug(false),
|
||||
m_mode(mode)
|
||||
#ifndef DISABLE_PYTHON
|
||||
#ifdef WITH_PYTHON
|
||||
, m_pythondictionary(NULL)
|
||||
#endif
|
||||
|
||||
@@ -84,7 +84,7 @@ int SCA_PythonController::Release()
|
||||
SCA_PythonController::~SCA_PythonController()
|
||||
{
|
||||
|
||||
#ifndef DISABLE_PYTHON
|
||||
#ifdef WITH_PYTHON
|
||||
//printf("released python byte script\n");
|
||||
|
||||
Py_XDECREF(m_bytecode);
|
||||
@@ -104,7 +104,7 @@ CValue* SCA_PythonController::GetReplica()
|
||||
{
|
||||
SCA_PythonController* replica = new SCA_PythonController(*this);
|
||||
|
||||
#ifndef DISABLE_PYTHON
|
||||
#ifdef WITH_PYTHON
|
||||
/* why is this needed at all??? - m_bytecode is NULL'd below so this doesnt make sense
|
||||
* but removing it crashes blender (with YoFrankie). so leave in for now - Campbell */
|
||||
Py_XINCREF(replica->m_bytecode);
|
||||
@@ -146,7 +146,7 @@ void SCA_PythonController::SetScriptName(const STR_String& name)
|
||||
}
|
||||
|
||||
|
||||
#ifndef DISABLE_PYTHON
|
||||
#ifdef WITH_PYTHON
|
||||
void SCA_PythonController::SetNamespace(PyObject* pythondictionary)
|
||||
{
|
||||
if (m_pythondictionary)
|
||||
@@ -171,7 +171,7 @@ int SCA_PythonController::IsTriggered(class SCA_ISensor* sensor)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifndef DISABLE_PYTHON
|
||||
#ifdef WITH_PYTHON
|
||||
|
||||
/* warning, self is not the SCA_PythonController, its a PyObjectPlus_Proxy */
|
||||
PyObject* SCA_PythonController::sPyGetCurrentController(PyObject *self)
|
||||
@@ -527,13 +527,13 @@ int SCA_PythonController::pyattr_set_script(void *self_v, const KX_PYATTRIBUTE_D
|
||||
return PY_SET_ATTR_SUCCESS;
|
||||
}
|
||||
|
||||
#else // DISABLE_PYTHON
|
||||
#else // WITH_PYTHON
|
||||
|
||||
void SCA_PythonController::Trigger(SCA_LogicManager* logicmgr)
|
||||
{
|
||||
/* intentionally blank */
|
||||
}
|
||||
|
||||
#endif // DISABLE_PYTHON
|
||||
#endif // WITH_PYTHON
|
||||
|
||||
/* eof */
|
||||
|
||||
Reference in New Issue
Block a user