Merge branch 'master' into Networking

This commit is contained in:
stiffly
2015-12-10 17:26:01 +01:00
7 changed files with 138 additions and 37 deletions
+1 -1
View File
@@ -13,7 +13,7 @@ out vec4 TextureFragment;
void main()
{
TextureFragment = vec4(PickingColor, 0, 1);
TextureFragment = vec4(PickingColor/255, 0, 1);
}