[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32397] trunk/blender/source/gameengine: building without python works again for the BGE
Campbell Barton
ideasman42 at gmail.com
Sun Oct 10 22:59:31 CEST 2010
Revision: 32397
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32397
Author: campbellbarton
Date: 2010-10-10 22:59:30 +0200 (Sun, 10 Oct 2010)
Log Message:
-----------
building without python works again for the BGE
Modified Paths:
--------------
trunk/blender/source/gameengine/Expressions/PyObjectPlus.h
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
Modified: trunk/blender/source/gameengine/Expressions/PyObjectPlus.h
===================================================================
--- trunk/blender/source/gameengine/Expressions/PyObjectPlus.h 2010-10-10 16:41:21 UTC (rev 32396)
+++ trunk/blender/source/gameengine/Expressions/PyObjectPlus.h 2010-10-10 20:59:30 UTC (rev 32397)
@@ -461,6 +461,7 @@
#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 @@
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
Modified: trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp 2010-10-10 16:41:21 UTC (rev 32396)
+++ trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp 2010-10-10 20:59:30 UTC (rev 32397)
@@ -136,14 +136,15 @@
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)
{
gp_KetsjiScene = scene;
Modified: trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp 2010-10-10 16:41:21 UTC (rev 32396)
+++ trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp 2010-10-10 20:59:30 UTC (rev 32397)
@@ -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
More information about the Bf-blender-cvs
mailing list