diff options
author | Porteries Tristan <republicthunderbolt9@gmail.com> | 2015-10-25 21:22:29 +0300 |
---|---|---|
committer | Porteries Tristan <republicthunderbolt9@gmail.com> | 2015-10-25 21:22:29 +0300 |
commit | 06d2ad018564ff0538dad042ebe5670788979171 (patch) | |
tree | 9cf328e4e7d5b8210aeb813e0ea8c86d8071cc49 /source/gameengine/Ketsji | |
parent | 0d59acccd33402295e2a18b4051a8192de555a36 (diff) |
BGE: Fix issues with async libload.
This patch fixes:
- the call of LibFree on a unfinished loaded library;
- memory leak created on end of game : the async libraries are loaded but not converted, so not freed with the master scene.
Reviewers: campbellbarton, sybren, youle, hg1, moguri, lordloki
Reviewed By: moguri, lordloki
Differential Revision: https://developer.blender.org/D1571
Diffstat (limited to 'source/gameengine/Ketsji')
-rw-r--r-- | source/gameengine/Ketsji/KX_ISceneConverter.h | 1 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_KetsjiEngine.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/source/gameengine/Ketsji/KX_ISceneConverter.h b/source/gameengine/Ketsji/KX_ISceneConverter.h index 2e1c16c6e32..1963fc7c48f 100644 --- a/source/gameengine/Ketsji/KX_ISceneConverter.h +++ b/source/gameengine/Ketsji/KX_ISceneConverter.h @@ -64,6 +64,7 @@ public: // handle any pending merges from asynchronous loads virtual void MergeAsyncLoads()=0; + virtual void FinalizeAsyncLoads() = 0; virtual void SetAlwaysUseExpandFraming(bool to_what) = 0; diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp index c6e5f734c16..f42e3e104ac 100644 --- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp +++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp @@ -1273,6 +1273,7 @@ void KX_KetsjiEngine::StopEngine() { if (m_bInitialized) { + m_sceneconverter->FinalizeAsyncLoads(); if (m_animation_record) { |