X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbatch.cpp;h=741d5a49413f5f2f0538e710ffe0148aa497de25;hp=cba63567497499260222b4f7cbe6dd1194d2abbe;hb=eb6a546dcffc1b67f0a23d8b075fbdc86a2872a0;hpb=ed2d1c8c5ac065751a7887b178b4499007c1ffe4

diff --git a/source/batch.cpp b/source/batch.cpp
index cba63567..741d5a49 100644
--- a/source/batch.cpp
+++ b/source/batch.cpp
@@ -60,12 +60,7 @@ Batch::Batch(PrimitiveType t):
 	min_index(0),
 	max_index(0),
 	restart(false)
-{
-	/* Make sure we have glEnable/DisableClientState to go with
-	NV_primitive_restart */
-	if(!MSP_primitive_restart && NV_primitive_restart)
-		(void)(bool)MSP_legacy_features;
-}
+{ }
 
 Batch::~Batch()
 {
@@ -138,7 +133,11 @@ void Batch::append(const Batch &other)
 	if(prim_type==LINE_STRIP || prim_type==LINE_LOOP || prim_type==TRIANGLE_FAN)
 	{
 		if(!MSP_primitive_restart)
+		{
 			static Require _req(NV_primitive_restart);
+			// Make sure we have glEnable/DisableClientState as well
+			static Require _req2(MSP_legacy_features);
+		}
 	}
 
 	if(other.data.empty())