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 -r22625:22668

Browse Source 
needed this for 2.5 testing
This commit is contained in:
Campbell Barton
2009-08-21 03:09:27 +00:00
parent 1be67b60fd 442ba39d49
commit 5cd51b4387
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -462,10 +462,11 @@ void KX_BlenderSceneConverter::RegisterGameObject(
m_map_blender_to_gameobject.insert(CHashedPtr(for_blenderobject),gameobject);
}
/* only need to run this during conversion since
* m_map_blender_to_gameobject is freed after conversion */
void KX_BlenderSceneConverter::UnregisterGameObject(
KX_GameObject *gameobject)
{
#if 0
struct Object *bobp= gameobject->GetBlenderObject();
if (bobp) {
CHashedPtr bptr(bobp);
@@ -477,7 +478,6 @@ void KX_BlenderSceneConverter::UnregisterGameObject(
m_map_blender_to_gameobject.remove(bptr);
}
}
#endif
}
KX_GameObject *KX_BlenderSceneConverter::FindGameObject(