diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-07-06 19:00:22 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-07-06 19:00:22 +0200 |
| commit | 32043605153543bd72eb012ff310367299ad4e8f (patch) | |
| tree | 91371b113a60d6069dd7d90d0819e4ea3bfdf58d /src/graphics/opengl/gldevice.cpp | |
| parent | e8c9945e13fca88a6f8232838682df0654437f3e (diff) | |
| download | colobot-32043605153543bd72eb012ff310367299ad4e8f.tar.gz colobot-32043605153543bd72eb012ff310367299ad4e8f.tar.bz2 colobot-32043605153543bd72eb012ff310367299ad4e8f.zip | |
Refactoring in math & texture modules
- moved texture-related structs to texture.h & code to texture.cpp
- cleaned up texture test code
- added Math:: namespace qualifiers to math modules for clarity
Diffstat (limited to 'src/graphics/opengl/gldevice.cpp')
| -rw-r--r-- | src/graphics/opengl/gldevice.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/graphics/opengl/gldevice.cpp b/src/graphics/opengl/gldevice.cpp index 3182dfc..f253568 100644 --- a/src/graphics/opengl/gldevice.cpp +++ b/src/graphics/opengl/gldevice.cpp @@ -135,7 +135,7 @@ bool Gfx::CGLDevice::Create() int maxTextures = 0; glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &maxTextures); - m_textures = std::vector<Gfx::Texture*> (maxTextures, NULL); + m_textures = std::vector<Gfx::Texture*> (maxTextures, (Gfx::Texture*)(NULL)); m_texturesEnabled = std::vector<bool> (maxTextures, false); m_texturesParams = std::vector<Gfx::TextureParams>(maxTextures, Gfx::TextureParams()); |