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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2011-05-07 00:18:42 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-05-07 00:18:42 +0400
commitcb12337363032e59967b4935e10e8d996f297ca1 (patch)
tree6d73642eaf1c0f8d793e752988dfdbdd4e41d150 /source/gameengine/Ketsji/KX_Scene.h
parent4eb1b5256e0159f747c055e10bd091a40fc834b7 (diff)
Code cleanup: remove source/kernel module, this wasn't really the kernel of
anything, only contained a hash map and functions to pass command line args to the game engine. Moved those to container and BlenderRoutines modules.
Diffstat (limited to 'source/gameengine/Ketsji/KX_Scene.h')
-rw-r--r--source/gameengine/Ketsji/KX_Scene.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/gameengine/Ketsji/KX_Scene.h b/source/gameengine/Ketsji/KX_Scene.h
index af6a31e786c..367bf0b82da 100644
--- a/source/gameengine/Ketsji/KX_Scene.h
+++ b/source/gameengine/Ketsji/KX_Scene.h
@@ -41,8 +41,8 @@
#include <set>
#include <list>
-#include "GEN_Map.h"
-#include "GEN_HashedPtr.h"
+#include "CTR_Map.h"
+#include "CTR_HashedPtr.h"
#include "SG_IObject.h"
#include "SCA_IScene.h"
#include "MT_Transform.h"
@@ -61,7 +61,7 @@ struct SM_MaterialProps;
struct SM_ShapeProps;
struct Scene;
-class GEN_HashedPtr;
+class CTR_HashedPtr;
class CListValue;
class CValue;
class SCA_LogicManager;
@@ -207,7 +207,7 @@ protected:
* used in AddReplicaObject to map game objects to their
* replicas so pointers can be updated.
*/
- GEN_Map <GEN_HashedPtr, void*> m_map_gameobject_to_replica;
+ CTR_Map <CTR_HashedPtr, void*> m_map_gameobject_to_replica;
/**
* Another temporary variable outstaying its welcome