diff options
| author | Porteries Tristan <republicthunderbolt9@gmail.com> | 2015-08-18 13:24:38 +0300 |
|---|---|---|
| committer | Porteries Tristan <republicthunderbolt9@gmail.com> | 2015-08-18 13:24:38 +0300 |
| commit | 81afa2953cab20a59f1997aaf12dc85f5acbea0b (patch) | |
| tree | 398ee04194e66bc73a8f9bac21ee8fda3f3f1d72 /source/gameengine | |
| parent | 3a8e73943e18c9df58381c744af020d69948f1e2 (diff) | |
BGE: Fix mesh not registered in scene libload.
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Ketsji/KX_Scene.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index 37ef44dafe2..723736906a9 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -2019,8 +2019,12 @@ static void MergeScene_GameObject(KX_GameObject* gameobj, KX_Scene *to, KX_Scene to->GetLogicManager()->RegisterGameObjectName(gameobj->GetName(), gameobj); to->GetLogicManager()->RegisterGameObj(gameobj->GetBlenderObject(), gameobj); - for (int i=0; i<gameobj->GetMeshCount(); ++i) - to->GetLogicManager()->RegisterGameMeshName(gameobj->GetMesh(i)->GetName(), gameobj->GetBlenderObject()); + for (int i = 0; i < gameobj->GetMeshCount(); ++i) { + RAS_MeshObject *meshobj = gameobj->GetMesh(i); + // Register the mesh object by name and blender object. + to->GetLogicManager()->RegisterGameMeshName(meshobj->GetName(), gameobj->GetBlenderObject()); + to->GetLogicManager()->RegisterMeshName(meshobj->GetName(), meshobj); + } } bool KX_Scene::MergeScene(KX_Scene *other) |