Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitchell Stokes <mogurijin@gmail.com>2013-06-18 08:15:27 +0400
committerMitchell Stokes <mogurijin@gmail.com>2013-06-18 08:15:27 +0400
commit1f785cc196632d0c1fea48507d44fb1b5843ae5d (patch)
tree0761293213f393493704ab69553486cf62f22813 /source/gameengine/Ketsji/KX_KetsjiEngine.h
parent5bd5e69e9819f22dc69a1a3aaf577e1ba8c32754 (diff)
BGE: Fix for [#32218] "logic.addScene() Not Adding Scenes in Order" reported by Josiah Lane (solarlune).
Adding scenes now uses a vector instead of a set to maintain order. This fix is partly based off of patch #32297 by Pavel Sadikov (sigmat).
Diffstat (limited to 'source/gameengine/Ketsji/KX_KetsjiEngine.h')
-rw-r--r--source/gameengine/Ketsji/KX_KetsjiEngine.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.h b/source/gameengine/Ketsji/KX_KetsjiEngine.h
index 0d7e41d7568..3cba3558db3 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.h
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.h
@@ -41,7 +41,6 @@
#include "KX_Python.h"
#include "KX_WorldInfo.h"
#include <vector>
-#include <set>
class KX_TimeCategoryLogger;
@@ -88,13 +87,13 @@ private:
class KX_Dome* m_dome; // dome stereo mode
/** Lists of scenes scheduled to be removed at the end of the frame. */
- std::set<STR_String> m_removingScenes;
+ std::vector<STR_String> m_removingScenes;
/** Lists of overley scenes scheduled to be added at the end of the frame. */
- std::set<STR_String> m_addingOverlayScenes;
+ std::vector<STR_String> m_addingOverlayScenes;
/** Lists of background scenes scheduled to be added at the end of the frame. */
- std::set<STR_String> m_addingBackgroundScenes;
+ std::vector<STR_String> m_addingBackgroundScenes;
/** Lists of scenes scheduled to be replaced at the end of the frame. */
- std::set<std::pair<STR_String,STR_String> > m_replace_scenes;
+ std::vector<std::pair<STR_String,STR_String> > m_replace_scenes;
/* The current list of scenes. */
KX_SceneList m_scenes;