diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-06-13 17:02:01 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-06-13 17:02:01 +0400 |
| commit | b40eb540d3a49c710bbd10effa9d9db04a915347 (patch) | |
| tree | 8e25085307896bb83c8fd5b6d8602f0edc006a6f /source/gameengine/Converter/KX_BlenderSceneConverter.cpp | |
| parent | c7debe1455f4e48e98ccb7af385dc1b1075f83e6 (diff) | |
G.sipo was being passed in the BGE when it wasnt needed, just access G.sipo directly.
KX_PythonSeq.cpp - disable the cmpfunc with py3, need to have richcmp.
Diffstat (limited to 'source/gameengine/Converter/KX_BlenderSceneConverter.cpp')
| -rw-r--r-- | source/gameengine/Converter/KX_BlenderSceneConverter.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp index 646e569a27e..42b96d65622 100644 --- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp +++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp @@ -94,11 +94,9 @@ extern "C" 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,13 +639,13 @@ void KX_BlenderSceneConverter::RegisterWorldInfo( * 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 (!G.sipo) return; int i; - EditIpo *ei= (EditIpo *)sipo->editipo; + EditIpo *ei= (EditIpo *)G.sipo->editipo; if (!ei) return; for(i=0; i<G.sipo->totipo; i++, ei++) { @@ -751,7 +749,7 @@ void KX_BlenderSceneConverter::ResetPhysicsObjectsAnimationIpo(bool clearIpo) if( tmpicu->bezt ) MEM_freeN( tmpicu->bezt ); MEM_freeN( tmpicu ); - localDel_ipoCurve( tmpicu ,m_sipo); + localDel_ipoCurve( tmpicu ); } } } else |