X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexunit.cpp;h=982e524e0189fa74a10181c9a2ff7f7014e8746e;hp=2b3418fee43cb4fe7a7f0276ad2f6ffdb2d602ea;hb=6fd9b09f47ff6a07bd5ca7f9e8887db3486bfcb1;hpb=787e0f5daaccb912fd351b26f9cb9026719ab384

diff --git a/source/texunit.cpp b/source/texunit.cpp
index 2b3418fe..982e524e 100644
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -49,6 +49,13 @@ const TexGen *TexUnit::get_texgen(unsigned i)
 	return texgen[i];
 }
 
+void TexUnit::bind()
+{
+	if(cur_unit!=this && (cur_unit || index))
+		glActiveTexture(GL_TEXTURE0+index);
+	cur_unit = this;
+}
+
 unsigned TexUnit::get_n_units()
 {
 	static int count = -1;
@@ -64,12 +71,12 @@ unsigned TexUnit::get_n_units()
 	return count;
 }
 
-TexUnit &TexUnit::activate(unsigned n)
+TexUnit &TexUnit::get_unit(unsigned n)
 {
 	if(n>0)
 		static Require _req(ARB_multitexture);
 	if(n>=get_n_units())
-		throw out_of_range("TexUnit::activate");
+		throw out_of_range("TexUnit::get_unit");
 
 	if(units.size()<=n)
 	{
@@ -79,17 +86,13 @@ TexUnit &TexUnit::activate(unsigned n)
 			units[i].index = i;
 	}
 
-	if(cur_unit!=&units[n] && (cur_unit || n))
-		glActiveTexture(GL_TEXTURE0+n);
-	cur_unit = &units[n];
-
 	return units[n];
 }
 
 TexUnit &TexUnit::current()
 {
 	if(!cur_unit)
-		return activate(0);
+		get_unit(0).bind();
 	return *cur_unit;
 }