[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48611] trunk/blender: code cleanup: remove Python.h include from blenkernel.
Campbell Barton
ideasman42 at gmail.com
Wed Jul 4 22:13:40 CEST 2012
Revision: 48611
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48611
Author: campbellbarton
Date: 2012-07-04 20:13:39 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
code cleanup: remove Python.h include from blenkernel.
Modified Paths:
--------------
trunk/blender/intern/audaspace/intern/AUD_C-API.cpp
trunk/blender/intern/audaspace/intern/AUD_C-API.h
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenkernel/SConscript
trunk/blender/source/gameengine/Ketsji/KX_SoundActuator.cpp
Modified: trunk/blender/intern/audaspace/intern/AUD_C-API.cpp
===================================================================
--- trunk/blender/intern/audaspace/intern/AUD_C-API.cpp 2012-07-04 19:30:30 UTC (rev 48610)
+++ trunk/blender/intern/audaspace/intern/AUD_C-API.cpp 2012-07-04 20:13:39 UTC (rev 48611)
@@ -244,7 +244,7 @@
return module;
}
-PyObject* AUD_getPythonFactory(AUD_Sound* sound)
+void* AUD_getPythonFactory(AUD_Sound* sound)
{
if(sound)
{
@@ -259,9 +259,9 @@
return NULL;
}
-AUD_Sound* AUD_getPythonSound(PyObject* sound)
+AUD_Sound* AUD_getPythonSound(void* sound)
{
- Factory* factory = checkFactory(sound);
+ Factory* factory = checkFactory((PyObject *)sound);
if(!factory)
return NULL;
Modified: trunk/blender/intern/audaspace/intern/AUD_C-API.h
===================================================================
--- trunk/blender/intern/audaspace/intern/AUD_C-API.h 2012-07-04 19:30:30 UTC (rev 48610)
+++ trunk/blender/intern/audaspace/intern/AUD_C-API.h 2012-07-04 20:13:39 UTC (rev 48611)
@@ -29,10 +29,6 @@
#ifndef __AUD_C_API_H__
#define __AUD_C_API_H__
-#ifdef WITH_PYTHON
-#include "Python.h"
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -740,14 +736,14 @@
* \param sound The sound factory.
* \return The python factory.
*/
-extern PyObject* AUD_getPythonFactory(AUD_Sound* sound);
+extern void* AUD_getPythonFactory(AUD_Sound* sound);
/**
* Retrieves the sound factory of a python factory.
* \param sound The python factory.
* \return The sound factory.
*/
-extern AUD_Sound* AUD_getPythonSound(PyObject* sound);
+extern AUD_Sound* AUD_getPythonSound(void* sound);
#endif
#ifdef __cplusplus
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2012-07-04 19:30:30 UTC (rev 48610)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2012-07-04 20:13:39 UTC (rev 48611)
@@ -317,9 +317,6 @@
list(APPEND INC
../python
)
- list(APPEND INC_SYS
- ${PYTHON_INCLUDE_DIRS}
- )
add_definitions(-DWITH_PYTHON)
if(WITH_PYTHON_SECURITY)
Modified: trunk/blender/source/blender/blenkernel/SConscript
===================================================================
--- trunk/blender/source/blender/blenkernel/SConscript 2012-07-04 19:30:30 UTC (rev 48610)
+++ trunk/blender/source/blender/blenkernel/SConscript 2012-07-04 20:13:39 UTC (rev 48611)
@@ -32,7 +32,6 @@
if env['WITH_BF_PYTHON']:
incs += ' ../python'
- incs += ' ' + env['BF_PYTHON_INC']
defs.append('WITH_PYTHON')
if env['BF_DEBUG']:
defs.append('DEBUG')
Modified: trunk/blender/source/gameengine/Ketsji/KX_SoundActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_SoundActuator.cpp 2012-07-04 19:30:30 UTC (rev 48610)
+++ trunk/blender/source/gameengine/Ketsji/KX_SoundActuator.cpp 2012-07-04 20:13:39 UTC (rev 48611)
@@ -433,7 +433,7 @@
{
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 @@
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;
More information about the Bf-blender-cvs
mailing list