From 5390ff46ae4c1fdd287c8a9a01ec7f4003bbd915 Mon Sep 17 00:00:00 2001
From: Ykkrosh <philip@wildfiregames.com>
Date: Fri, 6 Aug 2004 11:26:30 +0000
Subject: [PATCH] Hopefully fixed the infinitely annoying graphics crashes (#1,
 #3, #9, #10, #14 on the bug tracker)

This was SVN commit r922.
---
 source/renderer/PatchRData.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/source/renderer/PatchRData.cpp b/source/renderer/PatchRData.cpp
index 6cb3992cf2..35276d51d4 100755
--- a/source/renderer/PatchRData.cpp
+++ b/source/renderer/PatchRData.cpp
@@ -584,6 +584,7 @@ void CPatchRData::RenderBaseSplats()
 			// setup data pointers
 			u32 stride=sizeof(SBaseVertex);
 			MICROLOG(L"data pointers");
+
 			glVertexPointer(3,GL_FLOAT,stride,base+offsetof(SBaseVertex,m_Position));
 			glColorPointer(4,GL_UNSIGNED_BYTE,stride,base+offsetof(SBaseVertex,m_Color));
 			glTexCoordPointer(2,GL_FLOAT,stride,base+offsetof(SBaseVertex,m_UVs[0]));
@@ -598,6 +599,7 @@ void CPatchRData::RenderBaseSplats()
 					for (uint j=0;j<batch->m_IndexData.size();j++) {
 						MICROLOG(L"el");
 						glDrawElements(GL_QUADS,(GLsizei)batch->m_IndexData[j].first,GL_UNSIGNED_SHORT,batch->m_IndexData[j].second);
+
 						MICROLOG(L".");
 						g_Renderer.m_Stats.m_DrawCalls++;
 						g_Renderer.m_Stats.m_TerrainTris+=(u32)batch->m_IndexData[j].first/2;
@@ -716,6 +718,11 @@ void CPatchRData::RenderBlendSplats()
 	// restore default state: switch off blending
 	glDisable(GL_BLEND);
 
+	// switch off second uv set
+	glClientActiveTexture(GL_TEXTURE1);
+	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+	glClientActiveTexture(GL_TEXTURE0);
+
 	// switch off texture unit 1, make unit 0 active texture
 	g_Renderer.BindTexture(1,0);
 	glActiveTexture(GL_TEXTURE0);