X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbox.cpp;h=b20f0d04e98c237d6c96a1f99844f1898149d0e9;hp=0958d1b0930daa8d187e6dc430b4a8ed0886bc1a;hb=8e9d872c2ba8dc633d29a673ba93adf38d262a5c;hpb=6e42e65cb070ef86ea748423a1c6e0a59a937958

diff --git a/source/box.cpp b/source/box.cpp
index 0958d1b0..b20f0d04 100644
--- a/source/box.cpp
+++ b/source/box.cpp
@@ -36,15 +36,17 @@ void BoxBuilder::build(PrimitiveBuilder &builder) const
 void BoxBuilder::build_face(PrimitiveBuilder &builder, const Vector3 &o, const Vector3 &s1, const Vector3 &s2) const
 {
 	float l1 = 1, l2 = 1;
-	if(tangent_attr>=0 || tex_fit!=STRETCH)
+	if(generate_tbn || tex_fit!=STRETCH)
+	{
 		l1 = sqrt(s1.x*s1.x+s1.y*s1.y+s1.z*s1.z);
-	if(binormal_attr>=0 || tex_fit!=STRETCH)
 		l2 = sqrt(s2.x*s2.x+s2.y*s2.y+s2.z*s2.z);
+	}
 
-	if(tangent_attr>=0)
-		builder.attrib(tangent_attr, s1.x/l1, s1.y/l1, s1.z/l1);
-	if(binormal_attr>=0)
-		builder.attrib(binormal_attr, s2.x/l2, s2.y/l2, s2.z/l2);
+	if(generate_tbn)
+	{
+		builder.tangent(s1.x/l1, s1.y/l1, s1.z/l1);
+		builder.binormal(s2.x/l2, s2.y/l2, s2.z/l2);
+	}
 
 	float u_size = 1;
 	float v_size = 1;