X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fmaterial.cc;h=6288ef4640dcee291a78c33c6534cb54b0f61370;hb=ad052fc67fe4e76d2f4a01b2381a738da1708cdb;hp=6b10534581ef6f31661f72f67bda66f0172bd61a;hpb=21f74bf587d9b7a76bc1ee83db02cb8c243dc567;p=laserbrain_demo

diff --git a/src/material.cc b/src/material.cc
index 6b10534..6288ef4 100644
--- a/src/material.cc
+++ b/src/material.cc
@@ -22,10 +22,17 @@ void Material::setup() const
 	glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, ks);
 	glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, shininess);
 
+	/*
 	int ntex = std::min((int)textures.size(), 8);	// TODO: use max texture units
 	for(int i=0; i<ntex; i++) {
 		bind_texture(textures[i], i);
 	}
+	*/
+	for(int i=0; i<NUM_MTL_TEXTURES; i++) {
+		if(stdtex[i]) {
+			bind_texture(stdtex[i], i);
+		}
+	}
 
 	if(stdtex[MTL_TEX_LIGHTMAP]) {
 		bind_program(stdtex[MTL_TEX_DIFFUSE] ? sdr_ltmap : sdr_ltmap_notex);