From 53b63b5ed79badaf9f7b79bbe59d6fc7dd3612c9 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Mon, 5 May 2014 22:27:07 +0300 Subject: [PATCH] Some fixes to UV coordinate exporting --- blender/io_mspgl/export_mesh.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/blender/io_mspgl/export_mesh.py b/blender/io_mspgl/export_mesh.py index c1dd2ac0..39bf87b5 100644 --- a/blender/io_mspgl/export_mesh.py +++ b/blender/io_mspgl/export_mesh.py @@ -243,13 +243,20 @@ class MeshExporter: mesh.generate_material_uv() texunits = [] - if mesh.uv_layers and self.export_uv!="NONE": + force_unit0 = False + if mesh.uv_layers and (self.export_uv!="NONE" or self.material_tex): # Figure out which UV layers to export - if self.export_uv=="UNIT0": - if mesh.uv_layers[0].unit==0: - texunits = [0] - else: + if self.export_uv=="ALL": texunits = range(len(mesh.uv_layers)) + elif self.material_tex: + # The material UV layer is always the last one + texunits = [len(mesh.uv_layers)-1] + force_unit0 = True + else: + for i, u in enumerate(mesh.uv_layers): + if u.unit==0: + texunits = [i] + break texunits = [(i, mesh.uv_layers[i]) for i in texunits] texunits = [u for u in texunits if not u[1].hidden] @@ -285,7 +292,7 @@ class MeshExporter: fmt = ["NORMAL3"] if texunits: for i, u in texunits: - if u.unit==0: + if u.unit==0 or force_unit0: fmt.append("TEXCOORD2") else: fmt.append("TEXCOORD2_%d"%u.unit) @@ -296,7 +303,7 @@ class MeshExporter: fmt.append("VERTEX3") out_file.begin("vertices", *fmt) normal = None - uvs = [None]*len(texunits) + uvs = [None]*(max(u[0] for u in texunits)+1) tan = None bino = None group = None @@ -306,7 +313,7 @@ class MeshExporter: normal = v.normal for i, u in texunits: if v.uvs[i]!=uvs[i]: - if u.unit==0: + if u.unit==0 or force_unit0: out_file.write("texcoord2", *v.uvs[i]) else: out_file.write("multitexcoord2", u.unit, *v.uvs[i]) -- 2.43.0