X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=blender%2Fio_mesh_mspgl%2Fmesh.py;h=165c276fd1533c8b8adb89e85c13adddd4cc158d;hp=e3405f9f8e055490b71bf7a4323abcfc1475c752;hb=2298b92eddff337760561b12311d1f4e82745486;hpb=fc503f2996e663e6bea88d95e4b251dd87428161 diff --git a/blender/io_mesh_mspgl/mesh.py b/blender/io_mesh_mspgl/mesh.py index e3405f9f..165c276f 100644 --- a/blender/io_mesh_mspgl/mesh.py +++ b/blender/io_mesh_mspgl/mesh.py @@ -41,13 +41,15 @@ class Vertex: self._mvert = mv._mvert self.normal = mv.normal self.uvs = mv.uvs[:] + self.tan = mv.tan + self.bino = mv.bino else: self._mvert = mv self.uvs = [] + self.tan = None + self.bino = None self.flag = False self.faces = [] - self.tan = None - self.bino = None def __getattr__(self, attr): return getattr(self._mvert, attr) @@ -295,24 +297,18 @@ class Mesh: i = f.vertices.index(v) v.uvs = [u[i] for u in f.uvs] - def compute_tbn(self, uvtex): + def compute_tbn(self, index): if not self.uv_textures: return - uvtex_names = [u.name for u in self.uv_textures] - if uvtex in uvtex_names: - uvtex_index = uvtex_names.index(uvtex) - else: - uvtex_index = 0 - for v in self.vertices: v.tan = mathutils.Vector() v.bino = mathutils.Vector() for f in v.faces: fv = f.pivot_vertices(v) - uv0 = fv[0].uvs[uvtex_index] - uv1 = fv[1].uvs[uvtex_index] - uv2 = fv[-1].uvs[uvtex_index] + uv0 = fv[0].uvs[index] + uv1 = fv[1].uvs[index] + uv2 = fv[-1].uvs[index] du1 = uv1[0]-uv0[0] du2 = uv2[0]-uv0[0] dv1 = uv1[1]-uv0[1]