diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-07 00:18:42 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-07 00:18:42 +0400 |
| commit | cb12337363032e59967b4935e10e8d996f297ca1 (patch) | |
| tree | 6d73642eaf1c0f8d793e752988dfdbdd4e41d150 /source/gameengine/Converter/BL_ArmatureObject.cpp | |
| parent | 4eb1b5256e0159f747c055e10bd091a40fc834b7 (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/Converter/BL_ArmatureObject.cpp')
| -rw-r--r-- | source/gameengine/Converter/BL_ArmatureObject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/gameengine/Converter/BL_ArmatureObject.cpp b/source/gameengine/Converter/BL_ArmatureObject.cpp index 952af4db8bb..c6c20a96482 100644 --- a/source/gameengine/Converter/BL_ArmatureObject.cpp +++ b/source/gameengine/Converter/BL_ArmatureObject.cpp @@ -45,8 +45,8 @@ #include "BKE_armature.h" #include "BKE_constraint.h" -#include "GEN_Map.h" -#include "GEN_HashedPtr.h" +#include "CTR_Map.h" +#include "CTR_HashedPtr.h" #include "MEM_guardedalloc.h" #include "DNA_action_types.h" #include "DNA_armature_types.h" @@ -439,7 +439,7 @@ void BL_ArmatureObject::ReParentLogic() KX_GameObject::ReParentLogic(); } -void BL_ArmatureObject::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map) +void BL_ArmatureObject::Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map) { SG_DList::iterator<BL_ArmatureConstraint> cit(m_controlledConstraints); for (cit.begin(); !cit.end(); ++cit) { |