Update material class names to 2020

Author: y-khodja

addons/io_scene_gltf2_msfs_2020/blender/msfs_material_function.py

@@ -24,8 +24,8 @@
 
 
 class MSFS2020_Material:
-    bl_idname = "MSFS_ShaderNodeTree"
-    bl_label = "MSFS Shader Node Tree"
+    bl_idname = "MSFS2020_ShaderNodeTree"
+    bl_label = "MSFS2020 Shader Node Tree"
     bl_icon = "SOUND"
 
     def __init__(self, material, buildTree=False):
@@ -46,30 +46,30 @@ def __buildShaderTree(self):
         self.createNodetree()
 
     def force_update_properties(self):
-        from .msfs_material_prop_update import MSFS_Material_Property_Update
-
-        MSFS_Material_Property_Update.update_base_color_texture(self.material, bpy.context)
-        MSFS_Material_Property_Update.update_comp_texture(self.material, bpy.context)
-        MSFS_Material_Property_Update.update_normal_texture(self.material, bpy.context)
-        MSFS_Material_Property_Update.update_emissive_texture(self.material, bpy.context)
-        MSFS_Material_Property_Update.update_detail_color_texture(self.material, bpy.context)
-        MSFS_Material_Property_Update.update_detail_comp_texture(self.material, bpy.context)
-        MSFS_Material_Property_Update.update_detail_normal_texture(self.material, bpy.context)
-        MSFS_Material_Property_Update.update_blend_mask_texture(self.material, bpy.context)
-        MSFS_Material_Property_Update.update_extra_slot1_texture(self.material, bpy.context)
-        MSFS_Material_Property_Update.update_dirt_texture(self.material, bpy.context)
-        MSFS_Material_Property_Update.update_alpha_mode(self.material, bpy.context)
-        MSFS_Material_Property_Update.update_emissive_scale(self.material, bpy.context)
-        MSFS_Material_Property_Update.update_normal_scale(self.material, bpy.context)
-        MSFS_Material_Property_Update.update_color_sss(self.material, bpy.context)
-        MSFS_Material_Property_Update.update_double_sided(self.material, bpy.context)
-        MSFS_Material_Property_Update.update_alpha_cutoff(self.material, bpy.context)
-        MSFS_Material_Property_Update.update_detail_uv(self.material, bpy.context)
+        from .msfs_material_prop_update import MSFS2020_Material_Property_Update
+
+        MSFS2020_Material_Property_Update.update_base_color_texture(self.material, bpy.context)
+        MSFS2020_Material_Property_Update.update_comp_texture(self.material, bpy.context)
+        MSFS2020_Material_Property_Update.update_normal_texture(self.material, bpy.context)
+        MSFS2020_Material_Property_Update.update_emissive_texture(self.material, bpy.context)
+        MSFS2020_Material_Property_Update.update_detail_color_texture(self.material, bpy.context)
+        MSFS2020_Material_Property_Update.update_detail_comp_texture(self.material, bpy.context)
+        MSFS2020_Material_Property_Update.update_detail_normal_texture(self.material, bpy.context)
+        MSFS2020_Material_Property_Update.update_blend_mask_texture(self.material, bpy.context)
+        MSFS2020_Material_Property_Update.update_extra_slot1_texture(self.material, bpy.context)
+        MSFS2020_Material_Property_Update.update_dirt_texture(self.material, bpy.context)
+        MSFS2020_Material_Property_Update.update_alpha_mode(self.material, bpy.context)
+        MSFS2020_Material_Property_Update.update_emissive_scale(self.material, bpy.context)
+        MSFS2020_Material_Property_Update.update_normal_scale(self.material, bpy.context)
+        MSFS2020_Material_Property_Update.update_color_sss(self.material, bpy.context)
+        MSFS2020_Material_Property_Update.update_double_sided(self.material, bpy.context)
+        MSFS2020_Material_Property_Update.update_alpha_cutoff(self.material, bpy.context)
+        MSFS2020_Material_Property_Update.update_detail_uv(self.material, bpy.context)
         # Trigger setters
-        MSFS_Material_Property_Update.update_base_color(self.material, bpy.context)
-        MSFS_Material_Property_Update.update_emissive_color(self.material, bpy.context)
-        MSFS_Material_Property_Update.update_metallic_scale(self.material, bpy.context)
-        MSFS_Material_Property_Update.update_roughness_scale(self.material, bpy.context)
+        MSFS2020_Material_Property_Update.update_base_color(self.material, bpy.context)
+        MSFS2020_Material_Property_Update.update_emissive_color(self.material, bpy.context)
+        MSFS2020_Material_Property_Update.update_metallic_scale(self.material, bpy.context)
+        MSFS2020_Material_Property_Update.update_roughness_scale(self.material, bpy.context)
 
     def cleanNodeTree(self):
         nodes = self.material.node_tree.nodes

addons/io_scene_gltf2_msfs_2020/blender/msfs_material_panel.py

@@ -14,7 +14,7 @@
 
 import bpy
 
-from .msfs_material_prop_update import MSFS_Material_Property_Update
+from .msfs_material_prop_update import MSFS2020_Material_Property_Update
 
 # TODO: Remove eventually
 class MSFS2020_OT_MigrateMaterialData(bpy.types.Operator): 
@@ -69,7 +69,7 @@ def old_properties_present(active_material):
         if len(active_material.keys()) <= 0: 
             return False
 
-        for old_property in MSFS_OT_MigrateMaterialData.old_property_to_new_mapping:
+        for old_property in MSFS2020_OT_MigrateMaterialData.old_property_to_new_mapping:
             if active_material.get(old_property) is not None:
                 return True
 
@@ -80,7 +80,7 @@ def execute(self, context):
         for (
             old_property,
             new_property,
-        ) in MSFS_OT_MigrateMaterialData.old_property_to_new_mapping.items():
+        ) in MSFS2020_OT_MigrateMaterialData.old_property_to_new_mapping.items():
             if active_material.get(old_property) is None:
                 continue
 
@@ -157,7 +157,7 @@ def execute(self, context):
 
             del active_material["msfs_material_mode"]
 
-        MSFS_Material_Property_Update.update_msfs_material_type(active_material, context)
+        MSFS2020_Material_Property_Update.update_msfs_material_type(active_material, context)
 
         return {"FINISHED"}
 
@@ -223,8 +223,8 @@ def draw(self, context):
         if not active_material:
             return
 
-        if MSFS_OT_MigrateMaterialData.old_properties_present(active_material):
-            layout.operator(MSFS_OT_MigrateMaterialData.bl_idname)
+        if MSFS2020_OT_MigrateMaterialData.old_properties_present(active_material):
+            layout.operator(MSFS2020_OT_MigrateMaterialData.bl_idname)
 
         self.draw_prop(layout, active_material, "msfs_material_type")