Merge branch 'master' (early part) into sdl2

code/renderergl2/tr_local.h

@@ -698,6 +698,8 @@ typedef enum
 	UNIFORM_PRIMARYLIGHTAMBIENT,
 	UNIFORM_PRIMARYLIGHTRADIUS,
 
+	UNIFORM_CUBEMAPINFO,
+
 	UNIFORM_COUNT
 } uniform_t;
 
@@ -1179,8 +1181,6 @@ typedef struct {
 	int			clusterBytes;
 	const byte	*vis;			// may be passed in by CM_LoadMap to save space
 
-	byte		*novis;			// clusterBytes of 0xff
-
 	char		*entityString;
 	char		*entityParsePoint;
 } world_t;