From a371338c141b2124ad1261077b28c5ff7a508ee2 Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Sat, 21 Feb 2015 18:06:27 +0100
Subject: [PATCH] Fix transparency of fallback characters
---
data/shaders/colortexturedquad.frag | 2 +-
src/guiengine/scalable_font.cpp | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/data/shaders/colortexturedquad.frag b/data/shaders/colortexturedquad.frag
index 7fbabed16..45aa0bf58 100644
--- a/data/shaders/colortexturedquad.frag
+++ b/data/shaders/colortexturedquad.frag
@@ -7,5 +7,5 @@ out vec4 FragColor;
void main()
{
vec4 res = texture(tex, uv);
- FragColor = vec4(res.xyz * col.xyz, res.a);
+ FragColor = res * col;
}
diff --git a/src/guiengine/scalable_font.cpp b/src/guiengine/scalable_font.cpp
index c9ad661e7..980fcd836 100644
--- a/src/guiengine/scalable_font.cpp
+++ b/src/guiengine/scalable_font.cpp
@@ -668,9 +668,9 @@ void ScalableFont::doDraw(const core::stringw& text,
if (fallback[n])
{
// TODO: don't hardcode colors?
- static video::SColor orange(color.getAlpha(), 255, 100, 0);
- static video::SColor yellow(color.getAlpha(), 255, 220, 15);
- video::SColor title_colors[] = {yellow, orange, orange, yellow};
+ video::SColor orange(color.getAlpha(), 255, 100, 0);
+ video::SColor yellow(color.getAlpha(), 255, 220, 15);
+ video::SColor title_colors[] = {orange, yellow, orange, yellow};
if (charCollector != NULL)
{