From 30aef86ff13a43c3e0c0ecee2c0de10461fc3c9b Mon Sep 17 00:00:00 2001 From: Philipp Sehmisch Date: Wed, 20 Jun 2007 15:32:25 +0000 Subject: Set GL texture index to zero when an image uses the SDL backend (fix by Guillaume Melquiond from trunk version) --- ChangeLog | 7 ++++++- src/resources/image.cpp | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3cc0165..fef94424 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ -2007-06-13 Philipp Sehmisch +2007-06-20 Philipp Sehmisch + + * src/resources/image.cpp: Set GL texture index to zero when an image + uses the SDL backend (fix by Guillaume Melquiond from trunk version) + +2007-06-13 Philipp Sehmisch * The Mana World.dev: Updated DevCpp project file. 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; -- cgit v1.2.3-70-g09d2