From 0e92dd560300a0b255b5c173e715f2714e7c1765 Mon Sep 17 00:00:00 2001
From: oy <Tom_Adams@web.de>
Date: Sun, 24 Feb 2013 18:55:55 +0100
Subject: fixed some merge problems

---
 src/game/editor/editor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/game/editor')

diff --git a/src/game/editor/editor.cpp b/src/game/editor/editor.cpp
index ccd1757f..28a4eda9 100644
--- a/src/game/editor/editor.cpp
+++ b/src/game/editor/editor.cpp
@@ -1449,7 +1449,7 @@ void CEditor::DoQuadEnvelopes(const array<CQuad> &lQuads, int TexID)
 	Graphics()->LinesEnd();
 
 	//Draw Quads
-	Graphics()->TextureSet(Texture);
+	Graphics()->TextureSet(TexID);
 	Graphics()->QuadsBegin();
 	
 	for(int j = 0; j < Num; j++)
@@ -1510,7 +1510,7 @@ void CEditor::DoQuadEnvelopes(const array<CQuad> &lQuads, int TexID)
 		}
 	}
 	Graphics()->QuadsEnd();
-	Graphics()->TextureClear();
+	Graphics()->TextureSet(-1);
 	Graphics()->QuadsBegin();
 
 	// Draw QuadPoints
-- 
cgit 1.4.1