kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix for own bug added since 2.49a,

Browse Source 
2.49a tries to remove the object from the conversion list every time. Now remove from the conversion list directly without being apart of the remove object function.
This commit is contained in:
Campbell Barton 2009-08-21 03:06:36 +00:00
parent c73bad7bdd
commit 442ba39d49
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/gameengine/Converter/BL_BlenderDataConversion.cpp
View File

@ -2422,8 +2422,11 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
obj->Release();
}
childrenlist->Release();
// now destroy recursively
converter->UnregisterGameObject(childobj); // removing objects during conversion make sure this runs too
kxscene->RemoveObject(childobj);
continue;
}

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

@ -492,10 +492,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);
@ -507,7 +508,6 @@ void KX_BlenderSceneConverter::UnregisterGameObject(
m_map_blender_to_gameobject.remove(bptr);
}
}
#endif
}
KX_GameObject *KX_BlenderSceneConverter::FindGameObject(