Remove buggy part of r_separateMaterialPerShader

r_separateMaterialPerShader does two separate things. This one I am
removing doesn't work right and breaks many maps. The other part (for
not merging uniform data) is fine and has uncovered bugs.

Author: slipher

src/engine/renderer/Material.h

@@ -155,11 +155,6 @@ struct Material {
 	std::vector<Texture*> textures;
 
 	bool operator==( const Material& other ) {
-		if ( r_materialSeparatePerShader.Get() )
-		{
-			return refStage == other.refStage;
-		}
-
 		return program == other.program && stateBits == other.stateBits
 			&& fog == other.fog && cullType == other.cullType && usePolygonOffset == other.usePolygonOffset;
 	}

src/engine/renderer/tr_init.cpp

@@ -97,7 +97,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 	Cvar::Cvar<bool> r_gpuFrustumCulling( "r_gpuFrustumCulling", "Use frustum culling on the GPU for the Material System", Cvar::NONE, true );
 	Cvar::Cvar<bool> r_gpuOcclusionCulling( "r_gpuOcclusionCulling", "Use occlusion culling on the GPU for the Material System", Cvar::NONE, false );
 	Cvar::Cvar<bool> r_materialSystemSkip( "r_materialSystemSkip", "Temporarily skip Material System rendering, using only core renderer instead", Cvar::NONE, false );
-	Cvar::Cvar<bool> r_materialSeparatePerShader("r_materialSeparatePerShader", "generate a material for every q3shader stage (to debug merging)", Cvar::NONE, false);
+	Cvar::Cvar<bool> r_materialSeparatePerShader("r_materialSeparatePerShader", "store separate material uniforms for every q3shader stage (to debug merging)", Cvar::NONE, false);
 	cvar_t      *r_lightStyles;
 	cvar_t      *r_exportTextures;
 	cvar_t      *r_heatHaze;