Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r20849:20855

Browse Source 
to get the BGE building with py3k and no sdl
This commit is contained in:
Campbell Barton
2009-06-13 14:07:38 +00:00
parent b592b6e8be b40eb540d3
commit fa01eef27e
6 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
View File

@@ -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,14 +639,14 @@ 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 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 @@ 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