make super transparent textures have alpha
authorChris Taylor <chris@icculus.org>
Mon, 7 Nov 2005 15:37:18 +0000 (15:37 +0000)
committerChris Taylor <chris@icculus.org>
Mon, 7 Nov 2005 15:37:18 +0000 (15:37 +0000)
ChangeLog
arch/ogl/ogl.c

index f52a7fa..49b8b24 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-07  Chris Taylor  <chris@icculus.org>
+
+       * arch/ogl/ogl.c: make super transparent textures have alpha
+
 2005-08-13  Chris Taylor  <chris@icculus.org>
 
        * main/gauges.c: draw all gauges properly when using the cockpit
index 7c31b2b..4677373 100644 (file)
@@ -1,4 +1,4 @@
-/* $Id: ogl.c,v 1.37 2005-08-07 09:58:33 chris Exp $ */
+/* $Id: ogl.c,v 1.38 2005-11-07 15:36:46 chris Exp $ */
 /*
  *
  * Graphics support functions for OpenGL.
@@ -1917,7 +1917,7 @@ void ogl_loadbmtexture_f(grs_bitmap *bm, int flags)
        }
 #endif
        if (bm->gltexture == NULL){
-               ogl_init_texture(bm->gltexture = ogl_get_free_texture(), bm->bm_w, bm->bm_h, flags | ((bm->bm_flags & BM_FLAG_TRANSPARENT) ? OGL_FLAG_ALPHA : 0));
+               ogl_init_texture(bm->gltexture = ogl_get_free_texture(), bm->bm_w, bm->bm_h, flags | ((bm->bm_flags & (BM_FLAG_TRANSPARENT | BM_FLAG_SUPER_TRANSPARENT))? OGL_FLAG_ALPHA : 0));
        }
        else {
                if (bm->gltexture->handle>0)