summaryrefslogtreecommitdiff
path: root/src/resources/image.cpp
diff options
context:
space:
mode:
authorPhilipp Sehmisch <tmw@crushnet.org>2007-06-20 15:32:25 +0000
committerPhilipp Sehmisch <tmw@crushnet.org>2007-06-20 15:32:25 +0000
commit30aef86ff13a43c3e0c0ecee2c0de10461fc3c9b (patch)
tree4b2879a86e983c7fc3df05d98483a237f57718ae /src/resources/image.cpp
parent53f4ef05bb5638e89c3c2eb4a2c699cb8d2db7f2 (diff)
downloadmana-30aef86ff13a43c3e0c0ecee2c0de10461fc3c9b.tar.gz
mana-30aef86ff13a43c3e0c0ecee2c0de10461fc3c9b.tar.bz2
mana-30aef86ff13a43c3e0c0ecee2c0de10461fc3c9b.tar.xz
mana-30aef86ff13a43c3e0c0ecee2c0de10461fc3c9b.zip
Set GL texture index to zero when an image uses the SDL backend (fix by Guillaume Melquiond from trunk version)
Diffstat (limited to 'src/resources/image.cpp')
-rw-r--r--src/resources/image.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index 31e38d6d..2d5cbe82 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -32,7 +32,11 @@ bool Image::mUseOpenGL = false;
#endif
Image::Image(const std::string &idPath, SDL_Surface *image):
- Resource(idPath), mImage(image),
+ Resource(idPath),
+#ifdef USE_OPENGL
+ mGLImage(0),
+#endif
+ mImage(image),
mAlpha(1.0f)
{
mBounds.x = 0;