From cb2cf0c9b4219d3b7247bfa09eeae1d487f84fba Mon Sep 17 00:00:00 2001 From: QuantumCoderQC Date: Wed, 27 Oct 2021 16:41:50 +0200 Subject: [PATCH] keep both vert colors and shape keys --- blender/arm/exporter.py | 5 +---- blender/arm/material/make_shader.py | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/blender/arm/exporter.py b/blender/arm/exporter.py index def22fac..38f56057 100755 --- a/blender/arm/exporter.py +++ b/blender/arm/exporter.py @@ -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 diff --git a/blender/arm/material/make_shader.py b/blender/arm/material/make_shader.py index 026f1628..ccc0899c 100644 --- a/blender/arm/material/make_shader.py +++ b/blender/arm/material/make_shader.py @@ -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):