Merge remote-tracking branch 'origin/master' into Shadows

2016-03-03 03:30:01 +01:00
parent 7ea26d10ee f0c2fdead1
commit a0f2f2bf5f
96 changed files with 22437 additions and 797 deletions
@@ -40,7 +40,6 @@ layout (binding = 10) uniform sampler2D SpecularMapTexture3;
 layout (binding = 11) uniform sampler2D GlowMapTexture1;
 layout (binding = 12) uniform sampler2D GlowMapTexture2;
 layout (binding = 13) uniform sampler2D GlowMapTexture3;
-layout (binding = 13) uniform sampler2D GlowMapTexture3;
 layout (binding = 31) uniform samplerCube ShieldBuffer;

 #define TILE_SIZE 16