From c5b3c5d89f2be8f6ff5dcb2fcead861b55bdeef1 Mon Sep 17 00:00:00 2001 From: JoshQuake Date: Tue, 20 Aug 2024 09:49:19 -0700 Subject: [PATCH] removed redundant version checks --- src/addons/send2ue/core/io/fbx_b3.py | 11 +---------- src/addons/send2ue/core/io/fbx_b4.py | 13 +++---------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/src/addons/send2ue/core/io/fbx_b3.py b/src/addons/send2ue/core/io/fbx_b3.py index 24a4fbf8..b1ce3c7a 100644 --- a/src/addons/send2ue/core/io/fbx_b3.py +++ b/src/addons/send2ue/core/io/fbx_b3.py @@ -59,12 +59,6 @@ def export(**keywords): elem_props_template_finalize, fbx_name_class ) - - # Added version check to import new elem data type added in 4.0. Shading element was updated to use char instead of bool - if bpy.app.version[0] >= 4: - from io_scene_fbx.fbx_utils import ( - elem_data_single_char - ) convert_rad_to_deg_iter = units_convertor_iter("radian", "degree") @@ -455,10 +449,7 @@ def fbx_data_object_elements(root, ob_obj, scene_data): # object type, etc. elem_data_single_int32(model, b"MultiLayer", 0) elem_data_single_int32(model, b"MultiTake", 0) - if (bpy.app.version[0] >= 4): - elem_data_single_char(model, b"Shading", b"\x01") # Shading was changed to a char from bool in blender 4 - else: - elem_data_single_bool(model, b"Shading", True) + elem_data_single_bool(model, b"Shading", True) elem_data_single_string(model, b"Culling", b"CullingOff") if obj_type == b"Camera": diff --git a/src/addons/send2ue/core/io/fbx_b4.py b/src/addons/send2ue/core/io/fbx_b4.py index c19cb2a9..05d97ab2 100644 --- a/src/addons/send2ue/core/io/fbx_b4.py +++ b/src/addons/send2ue/core/io/fbx_b4.py @@ -55,18 +55,13 @@ def export(**keywords): elem_data_single_string, elem_data_single_int32_array, elem_data_single_float64_array, + elem_data_single_char, elem_properties, elem_props_template_init, elem_props_template_set, elem_props_template_finalize, fbx_name_class ) - - # Added version check to import new elem data type added in 4.0. Shading element was updated to use char instead of bool - if bpy.app.version[0] >= 4: - from io_scene_fbx.fbx_utils import ( - elem_data_single_char - ) convert_rad_to_deg_iter = units_convertor_iter("radian", "degree") @@ -540,10 +535,8 @@ def fbx_data_object_elements(root, ob_obj, scene_data): # object type, etc. elem_data_single_int32(model, b"MultiLayer", 0) elem_data_single_int32(model, b"MultiTake", 0) - if (bpy.app.version[0] >= 4): - elem_data_single_char(model, b"Shading", b"\x01") # Shading was changed to a char from bool in blender 4 - else: - elem_data_single_bool(model, b"Shading", True) + elem_data_single_char(model, b"Shading", b"\x01") # Shading was changed to a char from bool in blender 4 + elem_data_single_string(model, b"Culling", b"CullingOff") if obj_type == b"Camera":