[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20856] branches/blender2.5/blender/source /gameengine: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/ blender -r20849:20855
Campbell Barton
ideasman42 at gmail.com
Sat Jun 13 16:07:38 CEST 2009
Revision: 20856
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20856
Author: campbellbarton
Date: 2009-06-13 16:07:38 +0200 (Sat, 13 Jun 2009)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r20849:20855
to get the BGE building with py3k and no sdl
Modified Paths:
--------------
branches/blender2.5/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/blender2.5/blender/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/blender2.5/blender/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
branches/blender2.5/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/blender2.5/blender/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp
Modified: branches/blender2.5/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
===================================================================
--- branches/blender2.5/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp 2009-06-13 13:57:56 UTC (rev 20855)
+++ branches/blender2.5/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp 2009-06-13 14:07:38 UTC (rev 20856)
@@ -115,7 +115,6 @@
struct ARegion *ar,
char* scenename,
struct Main* maggie1,
- struct SpaceIpo *sipo,
int always_use_expand_framing)
{
int exitrequested = KX_EXIT_REQUEST_NO_REQUEST;
@@ -342,7 +341,7 @@
}
// create a scene converter, create and convert the startingscene
- KX_ISceneConverter* sceneconverter = new KX_BlenderSceneConverter(blenderdata,sipo, ketsjiengine);
+ KX_ISceneConverter* sceneconverter = new KX_BlenderSceneConverter(blenderdata, ketsjiengine);
ketsjiengine->SetSceneConverter(sceneconverter);
sceneconverter->addInitFromFrame=false;
if (always_use_expand_framing)
@@ -562,7 +561,6 @@
struct ARegion *ar,
char* scenename,
struct Main* maggie,
- struct SpaceIpo *sipo,
int always_use_expand_framing)
{
int exitrequested = KX_EXIT_REQUEST_NO_REQUEST;
@@ -661,7 +659,7 @@
if (exitrequested != KX_EXIT_REQUEST_QUIT_GAME)
{
// create a scene converter, create and convert the startingscene
- KX_ISceneConverter* sceneconverter = new KX_BlenderSceneConverter(maggie,sipo, ketsjiengine);
+ KX_ISceneConverter* sceneconverter = new KX_BlenderSceneConverter(maggie, ketsjiengine);
ketsjiengine->SetSceneConverter(sceneconverter);
sceneconverter->addInitFromFrame=true;
Modified: branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
===================================================================
--- branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp 2009-06-13 13:57:56 UTC (rev 20855)
+++ branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp 2009-06-13 14:07:38 UTC (rev 20856)
@@ -94,11 +94,9 @@
KX_BlenderSceneConverter::KX_BlenderSceneConverter(
struct Main* maggie,
- struct SpaceIpo* sipo,
class KX_KetsjiEngine* engine
)
: m_maggie(maggie),
- m_sipo(sipo),
m_ketsjiEngine(engine),
m_alwaysUseExpandFraming(false),
m_usemat(false),
@@ -641,14 +639,14 @@
* When deleting an IPO curve from Python, check if the IPO is being
* edited and if so clear the pointer to the old curve.
*/
-void KX_BlenderSceneConverter::localDel_ipoCurve ( IpoCurve * icu ,struct SpaceIpo* sipo)
+void KX_BlenderSceneConverter::localDel_ipoCurve ( IpoCurve * icu )
{
- if (!sipo)
+#if 0 //XXX
+ if (!G.sipo)
return;
int i;
-#if 0 //XXX
- EditIpo *ei= (EditIpo *)sipo->editipo;
+ EditIpo *ei= (EditIpo *)G.sipo->editipo;
if (!ei) return;
for(i=0; i<G.sipo->totipo; i++, ei++) {
@@ -753,7 +751,7 @@
if( tmpicu->bezt )
MEM_freeN( tmpicu->bezt );
MEM_freeN( tmpicu );
- localDel_ipoCurve( tmpicu ,m_sipo);
+ localDel_ipoCurve( tmpicu );
}
}
} else
Modified: branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
===================================================================
--- branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h 2009-06-13 13:57:56 UTC (rev 20855)
+++ branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h 2009-06-13 14:07:38 UTC (rev 20856)
@@ -44,7 +44,6 @@
class BL_Material;
struct IpoCurve;
struct Main;
-struct SpaceIpo;
struct Scene;
class KX_BlenderSceneConverter : public KX_ISceneConverter
@@ -69,7 +68,6 @@
GEN_Map<CHashedPtr,BL_InterpolatorList*> m_map_blender_to_gameipolist;
Main* m_maggie;
- SpaceIpo* m_sipo;
STR_String m_newfilename;
class KX_KetsjiEngine* m_ketsjiEngine;
@@ -78,13 +76,12 @@
bool m_usemat;
bool m_useglslmat;
- void localDel_ipoCurve ( IpoCurve * icu ,struct SpaceIpo* sipo);
+ void localDel_ipoCurve ( IpoCurve * icu );
// struct Ipo* findIpoForName(char* objName);
public:
KX_BlenderSceneConverter(
Main* maggie,
- SpaceIpo *sipo,
class KX_KetsjiEngine* engine
);
Modified: branches/blender2.5/blender/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
===================================================================
--- branches/blender2.5/blender/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp 2009-06-13 13:57:56 UTC (rev 20855)
+++ branches/blender2.5/blender/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp 2009-06-13 14:07:38 UTC (rev 20856)
@@ -158,12 +158,13 @@
bool SCA_Joystick::aAnyButtonPressIsPositive(void)
{
+#ifndef DISABLE_SDL
/* this is needed for the "all events" option
* so we know if there are no buttons pressed */
for (int i=0; i<m_buttonmax; i++)
if (SDL_JoystickGetButton(m_private->m_joystick, i))
return true;
-
+#endif
return false;
}
Modified: branches/blender2.5/blender/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
===================================================================
--- branches/blender2.5/blender/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp 2009-06-13 13:57:56 UTC (rev 20855)
+++ branches/blender2.5/blender/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp 2009-06-13 14:07:38 UTC (rev 20856)
@@ -659,7 +659,7 @@
updateEngineInfoDisplay();
// create a scene converter, create and convert the starting scene
- m_sceneconverter = new KX_BlenderSceneConverter(m_gamedata->main, 0, m_ketsjiengine);
+ m_sceneconverter = new KX_BlenderSceneConverter(m_gamedata->main, m_ketsjiengine);
if (m_sceneconverter)
{
m_ketsjiengine->SetSceneConverter(m_sceneconverter);
Modified: branches/blender2.5/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
===================================================================
--- branches/blender2.5/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp 2009-06-13 13:57:56 UTC (rev 20855)
+++ branches/blender2.5/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp 2009-06-13 14:07:38 UTC (rev 20856)
@@ -663,7 +663,7 @@
*/
// create a scene converter, create and convert the stratingscene
- m_sceneconverter = new KX_BlenderSceneConverter(m_maggie,0, m_ketsjiengine);
+ m_sceneconverter = new KX_BlenderSceneConverter(m_maggie, m_ketsjiengine);
if (m_sceneconverter)
{
STR_String startscenename = m_startSceneName.Ptr();
Modified: branches/blender2.5/blender/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
===================================================================
--- branches/blender2.5/blender/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp 2009-06-13 13:57:56 UTC (rev 20855)
+++ branches/blender2.5/blender/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp 2009-06-13 14:07:38 UTC (rev 20856)
@@ -529,8 +529,7 @@
if (k->kx_engine)
{
k->converter = new
- KX_BlenderSceneConverter(active_file->main, 0,
- k->kx_engine);
+ KX_BlenderSceneConverter(active_file->main, k->kx_engine);
PyObject* dictionaryobject
= initGamePlayerPythonScripting("Ketsji",
Modified: branches/blender2.5/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp
===================================================================
--- branches/blender2.5/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp 2009-06-13 13:57:56 UTC (rev 20855)
+++ branches/blender2.5/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp 2009-06-13 14:07:38 UTC (rev 20856)
@@ -313,7 +313,11 @@
NULL, /* printfunc tp_print; */
NULL, /* getattrfunc tp_getattr; */
NULL, /* setattrfunc tp_setattr; */
+#if PY_VERSION_HEX >= 0x03000000 // TODO - richcmp
+ NULL,
+#else
( cmpfunc ) KX_PythonSeq_compare, /* cmpfunc tp_compare; */
+#endif
( reprfunc ) KX_PythonSeq_repr, /* reprfunc tp_repr; */
/* Method suites for standard classes */
More information about the Bf-blender-cvs
mailing list