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/Rasterizer/RAS_MaterialBucket.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/Rasterizer/RAS_MaterialBucket.h')
-rw-r--r--source/gameengine/Rasterizer/RAS_MaterialBucket.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/Rasterizer/RAS_MaterialBucket.h b/source/gameengine/Rasterizer/RAS_MaterialBucket.h
index c46a36768ee..51c430dd57b 100644
--- a/source/gameengine/Rasterizer/RAS_MaterialBucket.h
+++ b/source/gameengine/Rasterizer/RAS_MaterialBucket.h
@@ -35,7 +35,7 @@
#define __RAS_MATERIALBUCKET
#include "RAS_TexVert.h"
-#include "GEN_Map.h"
+#include "CTR_Map.h"
#include "STR_HashedString.h"
#include "SG_QList.h"
@@ -193,7 +193,7 @@ class RAS_MeshMaterial
public:
RAS_MeshSlot *m_baseslot;
class RAS_MaterialBucket *m_bucket;
- GEN_Map<GEN_HashedPtr,RAS_MeshSlot*> m_slots;
+ CTR_Map<CTR_HashedPtr,RAS_MeshSlot*> m_slots;
#ifdef WITH_CXX_GUARDEDALLOC