Fixed|InFine: None-opaque backgrounds not drawn

skyjake · Jun 28, 2012 · 381871b · 381871b
1 parent ecc4247
commit 381871b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/doomsday/engine/portable/src/gl_draw.c b/doomsday/engine/portable/src/gl_draw.c
@@ -171,7 +171,7 @@ void GL_DrawRectf2TextureColor(double x, double y, double width, double height,
     int texW, int texH, const float topColor[3], float topAlpha,
     const float bottomColor[3], float bottomAlpha)
 {
-    if(!(topAlpha > 0 || bottomAlpha > 0)) return;
+    if(topAlpha <= 0 && bottomAlpha <= 0) return;
 
     LIBDENG_ASSERT_IN_MAIN_THREAD();
     LIBDENG_ASSERT_GL_CONTEXT_ACTIVE();

diff --git a/doomsday/engine/portable/src/ui2_main.c b/doomsday/engine/portable/src/ui2_main.c
@@ -542,6 +542,14 @@ static void drawPageBackground(fi_page_t* p, float x, float y, float width, floa
     vec3f_t topColor, bottomColor;
     float topAlpha, bottomAlpha;
 
+    V3f_Set(topColor,    p->_bg.topColor   [0].value * light, p->_bg.topColor   [1].value * light, p->_bg.topColor   [2].value * light);
+    topAlpha = p->_bg.topColor[3].value * alpha;
+
+    V3f_Set(bottomColor, p->_bg.bottomColor[0].value * light, p->_bg.bottomColor[1].value * light, p->_bg.bottomColor[2].value * light);
+    bottomAlpha = p->_bg.bottomColor[3].value * alpha;
+
+    if(topAlpha <= 0 && bottomAlpha <= 0) return;
+
     if(p->_bg.material)
     {
         const materialvariantspecification_t* spec = Materials_VariantSpecificationForContext(
@@ -552,12 +560,6 @@ static void drawPageBackground(fi_page_t* p, float x, float y, float width, floa
         glEnable(GL_TEXTURE_2D);
     }
 
-    V3f_Set(topColor,    p->_bg.topColor   [0].value * light, p->_bg.topColor   [1].value * light, p->_bg.topColor   [2].value * light);
-    topAlpha = p->_bg.topColor[3].value * alpha;
-
-    V3f_Set(bottomColor, p->_bg.bottomColor[0].value * light, p->_bg.bottomColor[1].value * light, p->_bg.bottomColor[2].value * light);
-    bottomAlpha = p->_bg.bottomColor[3].value * alpha;
-
     if(p->_bg.material || topAlpha < 1.0 || bottomAlpha < 1.0)
     {
         GL_BlendMode(BM_NORMAL);