Merge remote-tracking branch 'runelite/master' into 1508-merge

2019-08-15 19:49:55 +02:00
parent d430c50246 3a31996ad8
commit 93b1258080
12 changed files with 113 additions and 50 deletions
--- a/runelite-client/src/main/resources/net/runelite/client/plugins/gpu/frag.glsl
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/gpu/frag.glsl
@@ -31,7 +31,7 @@ uniform float smoothBanding;
 uniform vec4 fogColor;

 in vec4 Color;
-centroid in float fHsl;
+in float fHsl;
 in vec4 fUv;
 in float fogAmount;