diff options
| author | Nick Samarin <nicks1987@bigmir.net> | 2011-05-17 00:30:59 +0400 |
|---|---|---|
| committer | Nick Samarin <nicks1987@bigmir.net> | 2011-05-17 00:30:59 +0400 |
| commit | a918040902bdeb7c9793168710871e4a3b7777a3 (patch) | |
| tree | 7380f00bce5448d777d09f4be4d7127e8eecec49 /source/gameengine/Ketsji/KX_Scene.h | |
| parent | daeca2f8262884c436c5678225704b594ce5347b (diff) | |
| parent | 99ee18c684da65ba774175c0b57a086e8222464a (diff) | |
synched with trunk at revision 36569
Diffstat (limited to 'source/gameengine/Ketsji/KX_Scene.h')
| -rw-r--r-- | source/gameengine/Ketsji/KX_Scene.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/source/gameengine/Ketsji/KX_Scene.h b/source/gameengine/Ketsji/KX_Scene.h index 474aac41675..26dec2d612b 100644 --- a/source/gameengine/Ketsji/KX_Scene.h +++ b/source/gameengine/Ketsji/KX_Scene.h @@ -1,4 +1,4 @@ -/** +/* * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** @@ -26,6 +26,11 @@ * * ***** END GPL LICENSE BLOCK ***** */ + +/** \file KX_Scene.h + * \ingroup ketsji + */ + #ifndef __KX_SCENE_H #define __KX_SCENE_H @@ -36,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" @@ -56,7 +61,7 @@ struct SM_MaterialProps; struct SM_ShapeProps; struct Scene; -class GEN_HashedPtr; +class CTR_HashedPtr; class CListValue; class CValue; class SCA_LogicManager; @@ -203,7 +208,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 |