Changeset 8145 in orxonox.OLD for trunk/src/lib/graphics/importer/texture.h

Timestamp:

Jun 5, 2006, 11:49:26 AM (18 years ago)

Author:

bensch

Message:

trunk: merged the gui back
merged with command:
svn merge -r8114:HEAD ​https://svn.orxonox.net/orxonox/branches/gui .
→ no conflicts

File:

• trunk/src/lib/graphics/importer/texture.h (modified) (1 diff)

trunk/src/lib/graphics/importer/texture.h

@@ -34 +34 @@
     bool setSurface(SDL_Surface* newSurface);
     /** @returns true if the Surface has an Alpha Value. */
-    bool setAlpha(bool hasAlpha) { this->bAlpha = hasAlpha; };
+    bool setAlpha(bool hasAlpha) { this->bAlpha = hasAlpha; return this->bAlpha; };
     bool setTexture(GLuint texture);