diff options
| author | Charlie Carley <snailrose@gmail.com> | 2007-01-23 16:25:20 +0300 |
|---|---|---|
| committer | Charlie Carley <snailrose@gmail.com> | 2007-01-23 16:25:20 +0300 |
| commit | 56a4f529fd34d95e6c5965bb5531d494b04d5545 (patch) | |
| tree | a37f52570436e27e53930ef268e26b6c3ccae714 /source/gameengine/Ketsji/BL_Texture.cpp | |
| parent | 39d1d30350edc11b0b4d5a7563f88cbbb0bcb05e (diff) | |
Two errors caused by previous commit;
One related to extension handling on Linux, the other is a fix for compiling with Irix and STL
Diffstat (limited to 'source/gameengine/Ketsji/BL_Texture.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/BL_Texture.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/BL_Texture.cpp b/source/gameengine/Ketsji/BL_Texture.cpp index 6841bb2f959..4a5a426e9e8 100644 --- a/source/gameengine/Ketsji/BL_Texture.cpp +++ b/source/gameengine/Ketsji/BL_Texture.cpp @@ -248,7 +248,7 @@ bool BL_Texture::InitCubeMap(int unit, EnvMap *cubemap) BL_TextureObject obj; obj.gl_texture = mTexture; obj.ref_buffer = cubemap->ima; - g_textureManager.insert(std::make_pair(cubemap->ima->id.name, obj)); + g_textureManager.insert(std::pair<char*, BL_TextureObject>((char*)cubemap->ima->id.name, obj)); bool needs_split = false; |