diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-07-05 00:13:39 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-07-05 00:13:39 +0400 |
| commit | 21bf13989f0a38d56dbe98334e9503623a976ea2 (patch) | |
| tree | 735ab5bbc13a1dd32bd7c0f2d7099d2f92affeb5 /source | |
| parent | 6e97ecee00bef36fa21fd60a53271d651d43c2e0 (diff) | |
code cleanup: remove Python.h include from blenkernel.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/SConscript | 1 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_SoundActuator.cpp | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 056a6bf5866..02f7467f06e 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -317,9 +317,6 @@ if(WITH_PYTHON) list(APPEND INC ../python ) - list(APPEND INC_SYS - ${PYTHON_INCLUDE_DIRS} - ) add_definitions(-DWITH_PYTHON) if(WITH_PYTHON_SECURITY) diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index 64544adb26d..86124ed932e 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -32,7 +32,6 @@ if env['WITH_BF_FRAMESERVER']: if env['WITH_BF_PYTHON']: incs += ' ../python' - incs += ' ' + env['BF_PYTHON_INC'] defs.append('WITH_PYTHON') if env['BF_DEBUG']: defs.append('DEBUG') diff --git a/source/gameengine/Ketsji/KX_SoundActuator.cpp b/source/gameengine/Ketsji/KX_SoundActuator.cpp index 91f6224e197..db91cea9074 100644 --- a/source/gameengine/Ketsji/KX_SoundActuator.cpp +++ b/source/gameengine/Ketsji/KX_SoundActuator.cpp @@ -433,7 +433,7 @@ PyObject* KX_SoundActuator::pyattr_get_sound(void *self, const struct KX_PYATTRI { KX_SoundActuator * actuator = static_cast<KX_SoundActuator *> (self); if (!actuator->m_sound.isNull()) - return AUD_getPythonFactory(&actuator->m_sound); + return (PyObject *)AUD_getPythonFactory(&actuator->m_sound); else Py_RETURN_NONE; } @@ -547,7 +547,7 @@ int KX_SoundActuator::pyattr_set_sound(void *self, const struct KX_PYATTRIBUTE_D if (!PyArg_Parse(value, "O", &sound)) return PY_SET_ATTR_FAIL; - AUD_Reference<AUD_IFactory>* snd = reinterpret_cast<AUD_Reference<AUD_IFactory>*>(AUD_getPythonSound(sound)); + AUD_Reference<AUD_IFactory>* snd = reinterpret_cast<AUD_Reference<AUD_IFactory>*>(AUD_getPythonSound((void *)sound)); if (snd) { actuator->m_sound = *snd; |