X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexunit.cpp;h=2b3418fee43cb4fe7a7f0276ad2f6ffdb2d602ea;hb=706d49dc7ca9b3969f6f79db16b0cc02576f3de3;hp=0a5f9bf3a4c4a971489b59d5134204c5c66caa92;hpb=b250a711295f5ba00114f11a5b1c855eebe08d26;p=libs%2Fgl.git

diff --git a/source/texunit.cpp b/source/texunit.cpp
index 0a5f9bf3..2b3418fe 100644
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -1,6 +1,6 @@
 #include <stdexcept>
-#include "arb_multitexture.h"
-#include "arb_vertex_shader.h"
+#include <msp/gl/extensions/arb_multitexture.h>
+#include <msp/gl/extensions/arb_vertex_shader.h>
 #include "gl.h"
 #include "texunit.h"
 
@@ -72,7 +72,12 @@ TexUnit &TexUnit::activate(unsigned n)
 		throw out_of_range("TexUnit::activate");
 
 	if(units.size()<=n)
+	{
+		unsigned i = units.size();
 		units.resize(n+1);
+		for(; i<units.size(); ++i)
+			units[i].index = i;
+	}
 
 	if(cur_unit!=&units[n] && (cur_unit || n))
 		glActiveTexture(GL_TEXTURE0+n);