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/Converter/KX_SoftBodyDeformer.cpp
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/Converter/KX_SoftBodyDeformer.cpp')
-rw-r--r--source/gameengine/Converter/KX_SoftBodyDeformer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/gameengine/Converter/KX_SoftBodyDeformer.cpp b/source/gameengine/Converter/KX_SoftBodyDeformer.cpp
index d3d17bbe433..02c259d793b 100644
--- a/source/gameengine/Converter/KX_SoftBodyDeformer.cpp
+++ b/source/gameengine/Converter/KX_SoftBodyDeformer.cpp
@@ -41,8 +41,8 @@
#include "KX_ConvertPhysicsObject.h"
#include "KX_SoftBodyDeformer.h"
#include "RAS_MeshObject.h"
-#include "GEN_Map.h"
-#include "GEN_HashedPtr.h"
+#include "CTR_Map.h"
+#include "CTR_HashedPtr.h"
#ifdef USE_BULLET
@@ -53,7 +53,7 @@
#include "KX_BulletPhysicsController.h"
#include "btBulletDynamicsCommon.h"
-void KX_SoftBodyDeformer::Relink(GEN_Map<class GEN_HashedPtr, void*>*map)
+void KX_SoftBodyDeformer::Relink(CTR_Map<class CTR_HashedPtr, void*>*map)
{
void **h_obj = (*map)[m_gameobj];