From 83a60e746203b4ad4058a4b9e71b51aa25d819c9 Mon Sep 17 00:00:00 2001 From: QuantumCoderQC Date: Tue, 2 Nov 2021 15:59:15 +0100 Subject: [PATCH] Implement shape key conditions --- blender/arm/utils.py | 5 ++++- blender/arm/write_data.py | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/blender/arm/utils.py b/blender/arm/utils.py index eb184860..1deb9798 100755 --- a/blender/arm/utils.py +++ b/blender/arm/utils.py @@ -771,8 +771,11 @@ def export_bone_data(bobject: bpy.types.Object) -> bool: return bobject.find_armature() and is_bone_animation_enabled(bobject) and get_rp().arm_skin == 'On' def export_morph_targets(bobject: bpy.types.Object) -> bool: + if get_rp().arm_morph_target != 'On': + return False + if not hasattr(bobject.data, 'shape_keys'): - return False + return False shape_keys = bobject.data.shape_keys if not shape_keys: diff --git a/blender/arm/write_data.py b/blender/arm/write_data.py index 924b54d1..3074de7e 100755 --- a/blender/arm/write_data.py +++ b/blender/arm/write_data.py @@ -303,6 +303,9 @@ project.addSources('Sources'); rpdat = arm.utils.get_rp() if rpdat.arm_skin != 'Off': assets.add_khafile_def('arm_skin') + + if rpdat.arm_morph_target != 'Off': + assets.add_khafile_def('arm_morph_target') if rpdat.arm_particles != 'Off': assets.add_khafile_def('arm_particles')