From a42739b48ffbd0247a3b3bb6fc67160494959b5b Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Sat, 18 May 2019 17:55:16 +0300 Subject: [PATCH] Improve texture unit assignment when exporting meshes --- blender/io_mspgl/mesh.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/blender/io_mspgl/mesh.py b/blender/io_mspgl/mesh.py index 609f89a1..95749f46 100644 --- a/blender/io_mspgl/mesh.py +++ b/blender/io_mspgl/mesh.py @@ -1,6 +1,7 @@ import bpy import math import mathutils +import itertools def make_edge_key(i1, i2): return (min(i1, i2), max(i1, i2)) @@ -188,17 +189,21 @@ class Mesh: self.uv_layers = [] else: self.uv_layers = [UvLayer(u) for u in mesh.uv_layers] - self.uv_layers = sorted([u for u in self.uv_layers if not u.hidden], key=(lambda u: (u.unit or 1000, u.name))) + + # Assign texture unit numbers to UV layers that lack one + missing_unit = [u for u in self.uv_layers if u.unit is None] + if missing_unit: + missing_unit = sorted(missing_unit, key=(lambda u: u.name)) + used_units = [u.unit for u in self.uv_layers if u.unit is not None] + for u, n in zip(missing_unit, (i for i in itertools.count() if i not in used_units)): + u.unit = n + + self.uv_layers = sorted(self.uv_layers, key=(lambda u: u.unit)) if self.use_uv=='UNIT0': self.uv_layers = [self.uv_layers[0]] - - # Assign texture unit numbers to UV layers that lack one - next_unit = max((u.unit+1 for u in self.uv_layers if u.unit is not None), default=0) - for u in self.uv_layers: - if not u.unit: - u.unit = next_unit - next_unit += 1 + if self.uv_layers[0].unit!=0: + self.uv_layers = [] # Rewrite links between elements to point to cloned data, or create links # where they don't exist -- 2.43.0