More tag upgrading work and fix an issue with model importing

Author: General-101

io_scene_halo/file_tag/build_scene/build_bsp.py

@@ -426,8 +426,8 @@ def build_scene(context, tag_ref, asset_cache, game_title, fix_rotations, empty_
                                     SHAD_ASSET["blender_assets"][material_name] = mat
 
                             else:
-                                material_name = "invalid"
-                                if global_functions.string_empty_check(shader_name):
+                                material_name = "invalid_%sidx" % material_idx
+                                if not global_functions.string_empty_check(shader_name):
                                     material_name = os.path.basename(shader_name)
 
                                 if has_permutation:
@@ -654,7 +654,7 @@ def build_scene(context, tag_ref, asset_cache, game_title, fix_rotations, empty_
                         path = split_result[1]
                         shader_collection_dic[path] = prefix
 
-        for material in level_data["materials"]:
+        for material_idx, material in enumerate(level_data["materials"]):
             shader_tag = material["shader"]
             old_shader_tag = material["old shader"]
             shader_group = shader_tag["group name"]
@@ -709,8 +709,8 @@ def build_scene(context, tag_ref, asset_cache, game_title, fix_rotations, empty_
                     SHAD_ASSET["blender_assets"][material_name] = mat
 
             else:
-                material_name = "invalid"
-                if global_functions.string_empty_check(shader_name):
+                material_name = "invalid_%sidx" % material_idx
+                if not global_functions.string_empty_check(shader_name):
                     material_name = os.path.basename(shader_name)
 
                 if has_collection:

io_scene_halo/file_tag/h1/file_model/build_mesh.py

@@ -202,6 +202,7 @@ def build_mesh(mode_asset, geometry, armature, LOD, region_name, permutation_nam
                 base_name = os.path.basename(shader_name)
                 SHAD_ASSET = asset_cache.get(shader_group, {}).get(shader_name)
                 if SHAD_ASSET is not None:
+
                     material_name = base_name
                     if has_permutation:
                         material_name = "%s%s" % (base_name, permutation)
@@ -213,8 +214,8 @@ def build_mesh(mode_asset, geometry, armature, LOD, region_name, permutation_nam
                         SHAD_ASSET["blender_assets"][material_name] = mat
 
                 else:
-                    material_name = "invalid"
-                    if global_functions.string_empty_check(base_name):
+                    material_name = "invalid_%sidx" % triangle_material_index
+                    if not global_functions.string_empty_check(base_name):
                         material_name = base_name
 
                     if has_permutation:
@@ -293,18 +294,22 @@ def get_geometry_layout(tag_ref, asset_cache, armature, is_triangle_list, report
     random_color_gen = global_functions.RandomColorGenerator() # generates a random sequence of colors
     for shader in mode_data["shaders"]:
         shad_tag_ref = shader["shader"]
-        SHAD_ASSET = asset_cache[shad_tag_ref["group name"]][shad_tag_ref["path"]]
 
         material_name = os.path.basename(shad_tag_ref["path"])
         if shader["permutation"] != 0:
             material_name = "%s%s" % (material_name, shader["permutation"])
 
-        mat = SHAD_ASSET["blender_assets"].get(material_name)
-        if not mat:
-            mat = bpy.data.materials.new(name=material_name)
-            SHAD_ASSET["blender_assets"][material_name] = mat
-
-        shader_processing.generate_h1_shader(mat, shad_tag_ref, shader["permutation"], asset_cache, report)
+        group_entry = asset_cache.get(shad_tag_ref["group name"])
+        SHAD_ASSET = None
+        if group_entry is not None:
+            SHAD_ASSET = group_entry.get(shad_tag_ref["path"])
+            if SHAD_ASSET is not None:
+                mat = SHAD_ASSET["blender_assets"].get(material_name)
+                if not mat:
+                    mat = bpy.data.materials.new(name=material_name)
+                    SHAD_ASSET["blender_assets"][material_name] = mat
+
+                shader_processing.generate_h1_shader(mat, shad_tag_ref, shader["permutation"], asset_cache, report)
 
     full_mesh = None
     if simple_mesh:

io_scene_halo/file_tag/h2/file_render_model/build_mesh.py

@@ -230,7 +230,7 @@ def build_mesh(render_asset, geometry, armature, LOD, region_name, permutation_n
                     mat = mesh_processing.get_material(tag_element, asset_cache, "halo2", shader_collection_dic)
 
                 else:
-                    material_name = "invalid"
+                    material_name = "invalid_%sidx" % triangle_material_index
                     mat = bpy.data.materials.get(material_name)
                     if mat is None:
                         mat = bpy.data.materials.new(name=material_name)
@@ -338,7 +338,7 @@ def get_geometry_layout(tag_ref, asset_cache, armature, report, simple_mesh=Fals
                     path = split_result[1]
                     shader_collection_dic[path] = prefix
 
-    for material in render_data["materials"]:
+    for material_idx, material in enumerate(render_data["materials"]):
         shader_tag = material["shader"]
         old_shader_tag = material["old shader"]
         shader_group = shader_tag["group name"]
@@ -393,8 +393,8 @@ def get_geometry_layout(tag_ref, asset_cache, armature, report, simple_mesh=Fals
                 SHAD_ASSET["blender_assets"][material_name] = mat
 
         else:
-            material_name = "invalid"
-            if global_functions.string_empty_check(shader_name):
+            material_name = "invalid_%sidx" % material_idx
+            if not global_functions.string_empty_check(shader_name):
                 material_name = os.path.basename(shader_name)
 
             if has_collection: