bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

building without python works again for the BGE

Browse Source
This commit is contained in:
Campbell Barton 2010-10-10 20:59:30 +00:00
parent f49fc58df6
commit a20843bf34
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/gameengine/Expressions/PyObjectPlus.h
View File

@ -461,6 +461,7 @@ typedef PyTypeObject * PyParentObject; // Define the PyParent Object
#else // DISABLE_PYTHON
#ifdef WITH_CXX_GUARDEDALLOC
#define Py_Header \
public: \
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PyObjectPlus"); } \
@ -471,6 +472,16 @@ typedef PyTypeObject * PyParentObject; // Define the PyParent Object
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PyObjectPlusPtr"); } \
void operator delete( void *mem ) { MEM_freeN(mem); } \
#else // WITH_CXX_GUARDEDALLOC
#define Py_Header \
public: \
#define Py_HeaderPtr \
public: \
#endif // WITH_CXX_GUARDEDALLOC
#endif

5
source/gameengine/Ketsji/KX_PythonInit.cpp
View File

@ -136,13 +136,14 @@ static RAS_ICanvas* gp_Canvas = NULL;
static char gp_GamePythonPath[FILE_MAXDIR + FILE_MAXFILE] = "";
static char gp_GamePythonPathOrig[FILE_MAXDIR + FILE_MAXFILE] = ""; // not super happy about this, but we need to remember the first loaded file for the global/dict load save
static SCA_PythonKeyboard* gp_PythonKeyboard = NULL;
static SCA_PythonMouse* gp_PythonMouse = NULL;
#endif // DISABLE_PYTHON
static KX_Scene* gp_KetsjiScene = NULL;
static KX_KetsjiEngine* gp_KetsjiEngine = NULL;
static RAS_IRasterizer* gp_Rasterizer = NULL;
static SCA_PythonKeyboard* gp_PythonKeyboard = NULL;
static SCA_PythonMouse* gp_PythonMouse = NULL;
void KX_SetActiveScene(class KX_Scene* scene)
{

5
source/gameengine/Ketsji/KX_Scene.cpp
View File

@ -85,12 +85,7 @@
#ifdef USE_BULLET
#include "KX_SoftBodyDeformer.h"
#endif
// to get USE_BULLET!
#include "KX_ConvertPhysicsObject.h"
#ifdef USE_BULLET
#include "CcdPhysicsEnvironment.h"
#include "CcdPhysicsController.h"
#endif