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

keep both vert colors and shape keys

This commit is contained in:
QuantumCoderQC 2021-10-27 16:41:50 +02:00
parent 4522055fac
commit cb2cf0c9b4
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
blender/arm/exporter.py
View File

@ -1316,7 +1316,7 @@ class ArmoryExporter:
num_colors = len(exportMesh.vertex_colors)
has_col = self.get_export_vcols(bobject.data) and num_colors > 0
# Check if shape keys were exported
has_morph_target = self.get_shape_keys(bobject.data) and not has_col
has_morph_target = self.get_shape_keys(bobject.data)
if(has_morph_target):
num_uv_layers -= 1
morph_uv_index = self.get_morph_uv_index(bobject.data)
@ -1614,9 +1614,6 @@ Make sure the mesh only has tris/quads.""")
shape_keys = ArmoryExporter.get_shape_keys(mesh)
if shape_keys:
if self.get_export_vcols(bobject.data):
log.warn(oid + ' has vertex colors. Shape keys are not supported for objects with vertex colors')
shape_keys = False
# Save the morph state
active_shape_key_index = bobject.active_shape_key_index
show_only_shape_key = bobject.show_only_shape_key

3
blender/arm/material/make_shader.py
View File

@ -188,8 +188,7 @@ def make_instancing_and_skinning(mat: Material, mat_users: Dict[Material, List[O
for bo in mat_users[mat]:
if mat.arm_custom_material == '':
# Morph Targets
if arm.utils.export_morph_targets(bo) and not arm.utils.export_vcols(bo):
print("sk and no vcol")
if arm.utils.export_morph_targets(bo):
global_elems.append({'name': 'morph', 'data': 'short2norm'})
# GPU Skinning
if arm.utils.export_bone_data(bo):