From 9d1dbf4eab1ad27390f44e729b1e99d6bc522bd4 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sun, 29 Jun 2014 14:08:44 +0200
Subject: [PATCH] - fixed: FBufferedUniform1f didn'T work because it used an
 int as its buffered value.

---
 src/gl/shaders/gl_shader.h         | 2 +-
 wadsrc/static/shaders/glsl/main.vp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gl/shaders/gl_shader.h b/src/gl/shaders/gl_shader.h
index 173a1c781..d1518088d 100644
--- a/src/gl/shaders/gl_shader.h
+++ b/src/gl/shaders/gl_shader.h
@@ -80,7 +80,7 @@ public:
 
 class FBufferedUniform1f
 {
-	int mBuffer;
+	float mBuffer;
 	int mIndex;
 
 public:
diff --git a/wadsrc/static/shaders/glsl/main.vp b/wadsrc/static/shaders/glsl/main.vp
index 5e7890a61..66ef3b51e 100644
--- a/wadsrc/static/shaders/glsl/main.vp
+++ b/wadsrc/static/shaders/glsl/main.vp
@@ -6,7 +6,7 @@ out vec2 glowdist;
 
 void main()
 {
-	vec4 worldcoord = /* ModelMatrix * */ mix(gl_Vertex, aVertex2, uInterpolationFactor);
+	vec4 worldcoord = mix(gl_Vertex, aVertex2, uInterpolationFactor);
 	vec4 eyeCoordPos = ViewMatrix * worldcoord;
 
 	gl_FrontColor = gl_Color;