svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r20849:20855
authorCampbell Barton <ideasman42@gmail.com>
Sat, 13 Jun 2009 14:07:38 +0000 (14:07 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 13 Jun 2009 14:07:38 +0000 (14:07 +0000)
to get the BGE building with py3k and no sdl

1  2 
source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
source/gameengine/GamePlayer/ghost/GPG_Application.cpp

@@@ -112,10 -102,8 +112,9 @@@ static BlendFileData *load_game_data(ch
  }
  
  extern "C" void StartKetsjiShell(struct ScrArea *area,
 +                                                               struct ARegion *ar,
                                                                 char* scenename,
                                                                 struct Main* maggie1,
-                                                                struct SpaceIpo *sipo,
                                                                 int always_use_expand_framing)
  {
        int exitrequested = KX_EXIT_REQUEST_NO_REQUEST;
  }
  
  extern "C" void StartKetsjiShellSimulation(struct ScrArea *area,
 +                                                               struct ARegion *ar,
                                                                 char* scenename,
                                                                 struct Main* maggie,
-                                                                struct SpaceIpo *sipo,
                                                                 int always_use_expand_framing)
  {
      int exitrequested = KX_EXIT_REQUEST_NO_REQUEST;
@@@ -641,9 -639,9 +639,10 @@@ void KX_BlenderSceneConverter::Register
   * 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)
++void KX_BlenderSceneConverter::localDel_ipoCurve ( IpoCurve * icu )
  {
-       if (!sipo)
++#if 0 //XXX
+       if (!G.sipo)
                return;
  
        int i;