From 5a374dd73ee5647305ed9cc30877106d0d4c9dbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sun, 3 Mar 2013 17:44:25 +0100
Subject: [PATCH] Shaders: support alpha in VectorShader::setColor().

---
 src/Shaders/VectorShader.frag | 6 +++---
 src/Shaders/VectorShader.h    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Shaders/VectorShader.frag b/src/Shaders/VectorShader.frag
index d763ec4cc..eb1238fb1 100644
--- a/src/Shaders/VectorShader.frag
+++ b/src/Shaders/VectorShader.frag
@@ -4,9 +4,9 @@
 #endif
 
 #ifdef EXPLICIT_UNIFORM_LOCATION
-layout(location = 1) uniform vec3 color;
+layout(location = 1) uniform vec4 color;
 #else
-uniform lowp vec3 color;
+uniform lowp vec4 color;
 #endif
 
 #ifdef EXPLICIT_TEXTURE_LAYER
@@ -23,5 +23,5 @@ out vec4 fragmentColor;
 
 void main() {
     lowp float intensity = texture(vectorTexture, fragmentTextureCoordinates).r;
-    fragmentColor = vec4(intensity*color, intensity);
+    fragmentColor = intensity*color;
 }
diff --git a/src/Shaders/VectorShader.h b/src/Shaders/VectorShader.h
index 642b8c7fb..b116803fa 100644
--- a/src/Shaders/VectorShader.h
+++ b/src/Shaders/VectorShader.h
@@ -43,7 +43,7 @@ template<UnsignedInt dimensions> class MAGNUM_SHADERS_EXPORT VectorShader: publi
         }
 
         /** @brief Set fill color */
-        inline VectorShader* setColor(const Color3<>& color) {
+        inline VectorShader* setColor(const Color4<>& color) {
             AbstractVectorShader<dimensions>::setUniform(colorUniform, color);
             return this;
         }