maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

clean up export

Browse source
This commit is contained in:
QuantumCoderQC 2021-11-02 15:56:24 +01:00
parent 3c0f580f69
commit a1951bb66e
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
blender/arm/exporter.py
View file

@ -198,19 +198,22 @@ class ArmoryExporter:
@staticmethod @staticmethod
def get_shape_keys(mesh): def get_shape_keys(mesh):
rpdat = arm.utils.get_rp()
if(rpdat.arm_morph_target != 'On'):
return False
# Metaball # Metaball
if not hasattr(mesh, 'shape_keys'): if not hasattr(mesh, 'shape_keys'):
return None return False
shape_keys = mesh.shape_keys shape_keys = mesh.shape_keys
if not shape_keys: if not shape_keys:
return None return False
if len(shape_keys.key_blocks) < 2: if len(shape_keys.key_blocks) < 2:
return None return False
for shape_key in shape_keys.key_blocks[1:]: for shape_key in shape_keys.key_blocks[1:]:
if(not shape_key.mute): if(not shape_key.mute):
return shape_keys return True
return None return False
@staticmethod @staticmethod
def get_morph_uv_index(mesh): def get_morph_uv_index(mesh):
@ -1332,7 +1335,7 @@ class ArmoryExporter:
has_col = self.get_export_vcols(bobject.data) and num_colors > 0 has_col = self.get_export_vcols(bobject.data) and num_colors > 0
# Check if shape keys were exported # Check if shape keys were exported
has_morph_target = self.get_shape_keys(bobject.data) has_morph_target = self.get_shape_keys(bobject.data)
if(has_morph_target): if has_morph_target:
# Shape keys UV are exported separately, so reduce UV count by 1 # Shape keys UV are exported separately, so reduce UV count by 1
num_uv_layers -= 1 num_uv_layers -= 1
morph_uv_index = self.get_morph_uv_index(bobject.data) morph_uv_index = self.get_morph_uv_index(bobject.data)
@ -1361,7 +1364,12 @@ class ArmoryExporter:
break break
if has_tex1: if has_tex1:
for i in range(0, len(uv_layers)): for i in range(0, len(uv_layers)):
if i != t0map and uv_layers[i].name != 'UVMap_shape_key': # Not UVMap 0
if i != t0map:
# Not Shape Key UVMap
if has_morph_target and uv_layers[i].name == 'UVMap_shape_key':
continue
# Neither UVMap 0 Nor Shape Key Map
t1map = i t1map = i
t1data = np.empty(num_verts * 2, dtype='<f4') t1data = np.empty(num_verts * 2, dtype='<f4')
# Scale for packed coords # Scale for packed coords