addons/io_scene_swbf_msh/__init__.py

@@ -1,8 +1,8 @@
 bl_info = {
     'name': 'SWBF .msh Import-Export',
     'author': 'Will Snyder, PrismaticFlower',
-    "version": (1, 3, 3),
+    "version": (1, 3, 0),
-    'blender': (4, 3, 2),
+    'blender': (2, 80, 0),
     'location': 'File > Import-Export',
     'description': 'Export as SWBF .msh file',
     'warning': '',
@@ -261,4 +261,4 @@ def unregister():
 
 
 if __name__ == "__main__":
-    register()
+    register()

addons/io_scene_swbf_msh/msh_anim_gather.py

@@ -67,7 +67,7 @@ def extract_anim(armature: bpy.types.Armature, root_name: str) -> Animation:
 
     for frame in range(num_frames):
         
-        frame_time = int(framerange.x + frame * increment)
+        frame_time = framerange.x + frame * increment
         bpy.context.scene.frame_set(frame_time)
 
         for keyable_bone in keyable_bones:

addons/io_scene_swbf_msh/msh_anim_to_blend.py

@@ -107,4 +107,4 @@ def extract_and_apply_anim(filename : str, scene : Scene):
 
         arma.animation_data.action = action
         track = arma.animation_data.nla_tracks.new()
-        track.strips.new(action.name, int(action.frame_range[0]), action)
+        track.strips.new(action.name, action.frame_range[0], action)

addons/io_scene_swbf_msh/msh_material_operators.py

@@ -180,10 +180,8 @@ to provide an exact emulation"""
 
             texture_input_nodes.append(texImage)
 
-            specular_key = "Specular" if bpy.app.version < (4, 0, 0) else "Specular IOR Level"
-
             bsdf.inputs["Roughness"].default_value = 1.0
-            bsdf.inputs[specular_key].default_value = 0.0
+            bsdf.inputs["Specular"].default_value = 0.0
 
             material.use_backface_culling = not bool(mat_props.doublesided)
 

addons/io_scene_swbf_msh/msh_mesh_to_blend.py

@@ -128,6 +128,7 @@ def model_to_mesh_object(model: Model, scene : Scene, materials_map : Dict[str,
         blender_mesh.loops.foreach_set("vertex_index", flat_indices)
 
         # Normals
+        blender_mesh.create_normals_split()
         blender_mesh.loops.foreach_set("normal", [component for i in flat_indices for component in vertex_normals[i]])
 
         # UVs
@@ -174,6 +175,7 @@ def model_to_mesh_object(model: Model, scene : Scene, materials_map : Dict[str,
         reset_normals = [0.0] * (len(blender_mesh.loops) * 3)
         blender_mesh.loops.foreach_get("normal", reset_normals)
         blender_mesh.normals_split_custom_set(tuple(zip(*(iter(reset_normals),) * 3)))
+        blender_mesh.use_auto_smooth = True
 
 
     blender_mesh_object = bpy.data.objects.new(model.name, blender_mesh)
@@ -196,3 +198,4 @@ def model_to_mesh_object(model: Model, scene : Scene, materials_map : Dict[str,
 
 
     return blender_mesh_object
+

addons/io_scene_swbf_msh/msh_model_gather.py

@@ -215,11 +215,10 @@ def create_mesh_geometry(mesh: bpy.types.Mesh, valid_vgroup_indices: Set[int]) -
                 yield mesh.uv_layers.active.data[loop_index].uv.y
 
             if segment.colors is not None:
-                active_color = mesh.color_attributes.active_color
+                data_type = mesh.color_attributes.active_color.data_type
-                data_index = loop_index if active_color.domain == "CORNER" else vertex_index
+                if data_type == "FLOAT_COLOR" or data_type == "BYTE_COLOR":
-
+                    for v in mesh.color_attributes.active_color.data[vertex_index].color:
-                for v in mesh.color_attributes.active_color.data[data_index].color:
+                        yield v
-                    yield v
 
             if segment.weights is not None:
                 for v in mesh.vertices[vertex_index].groups:
@@ -248,10 +247,9 @@ def create_mesh_geometry(mesh: bpy.types.Mesh, valid_vgroup_indices: Set[int]) -
             segment.texcoords.append(mesh.uv_layers.active.data[loop_index].uv.copy())
 
         if segment.colors is not None:
-            active_color = mesh.color_attributes.active_color
+            data_type = mesh.color_attributes.active_color.data_type
-            data_index = loop_index if active_color.domain == "CORNER" else vertex_index
+            if data_type == "FLOAT_COLOR" or data_type == "BYTE_COLOR":
-
+                segment.colors.append(list(mesh.color_attributes.active_color.data[vertex_index].color))
-            segment.colors.append(list(active_color.data[data_index].color))
 
         if segment.weights is not None:
             groups = mesh.vertices[vertex_index].groups