Use ColorIndexForNumber in Con_DrawSolidConsole
Fix 6155: OpenGL2: some shader stages remains visible through fog volumes

Fix CalcFog in generic_vp.glsl to fog fogged surfaces.
Now it's the same as CalcFog in fogpass_vp.glsl.

Fixes shaders that use adjustColorsForFog. Impact wallmarks, blood sprites, flame textures and so on.
Merge remote-tracking branch 'ioquake3/master'

Conflicts:
	code/client/cl_console.c