diff options
| author | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2007-06-16 15:41:47 +0000 |
|---|---|---|
| committer | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2007-06-16 15:41:47 +0000 |
| commit | 029d6efeee63ed3e0964c6759d29e885d0877135 (patch) | |
| tree | d4270d3483eadb9d068baf8c25dbf3f16a4873b3 | |
| parent | a8a1e84128c7f729220391546c981552a7466f1f (diff) | |
| download | mana-client-029d6efeee63ed3e0964c6759d29e885d0877135.tar.gz mana-client-029d6efeee63ed3e0964c6759d29e885d0877135.tar.bz2 mana-client-029d6efeee63ed3e0964c6759d29e885d0877135.tar.xz mana-client-029d6efeee63ed3e0964c6759d29e885d0877135.zip | |
Set GL texture index to zero when an image uses the SDL backend.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/resources/image.cpp | 6 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2007-06-16 Guillaume Melquiond <guillaume.melquiong@gmail.com> + + * src/resources/image.cpp: Set GL texture index to zero when an image + uses the SDL backend. + 2007-06-15 Eugenio Favalli <elvenprogrammer@gmail.com> * tmw.cbp: Updated Code::Blocks project file. diff --git a/src/resources/image.cpp b/src/resources/image.cpp index d7d4e64b..993b0a2b 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; |