Merge branch 'f3d-to-bdsf' of github.com:Lilaa3/fast64 into f3d-to-bdsf

__init__.py

@@ -4,7 +4,7 @@
 
 from . import addon_updater_ops
 
-from .fast64_internal.utility import prop_split, multilineLabel, draw_and_check_tab
+from .fast64_internal.utility import prop_split
 
 from .fast64_internal.repo_settings import (
     draw_repo_settings,
@@ -72,36 +72,6 @@
 )
 
 
-class F3D_GlobalSettingsPanel(bpy.types.Panel):
-    bl_idname = "F3D_PT_global_settings"
-    bl_label = "F3D Global Settings"
-    bl_space_type = "VIEW_3D"
-    bl_region_type = "UI"
-    bl_category = "Fast64"
-
-    @classmethod
-    def poll(cls, context):
-        return True
-
-    # called every frame
-    def draw(self, context):
-        col = self.layout.column()
-        col.scale_y = 1.1  # extra padding
-        prop_split(col, context.scene, "f3d_type", "F3D Microcode")
-        col.prop(context.scene, "saveTextures")
-        col.prop(context.scene, "f3d_simple", text="Simple Material UI")
-        col.prop(context.scene, "exportInlineF3D", text="Bleed and Inline Material Exports")
-        if context.scene.exportInlineF3D:
-            multilineLabel(
-                col.box(),
-                "While inlining, all meshes will be restored to world default values.\n         You can configure these values in the world properties tab.",
-                icon="INFO",
-            )
-        col.prop(context.scene, "ignoreTextureRestrictions")
-        if context.scene.ignoreTextureRestrictions:
-            col.box().label(text="Width/height must be < 1024. Must be png format.")
-
-
 class Fast64_GlobalSettingsPanel(bpy.types.Panel):
     bl_idname = "FAST64_PT_global_settings"
     bl_label = "Fast64 Global Settings"
@@ -328,9 +298,7 @@ def draw(self, context):
     Fast64_Properties,
     Fast64_BoneProperties,
     Fast64_ObjectProperties,
-    F3D_GlobalSettingsPanel,
     Fast64_GlobalSettingsPanel,
-    Fast64_GlobalToolsPanel,
     UpgradeF3DMaterialsDialog,
 )
 
@@ -476,10 +444,7 @@ def register():
 # called on add-on disabling
 def unregister():
     utility_anim_unregister()
-    op_largetexture_unregister()
-    flipbook_unregister()
-    f3d_writer_unregister()
-    f3d_parser_unregister()
+    f3d_unregister(True)
     sm64_unregister(True)
     oot_unregister(True)
     mk64_unregister(True)

fast64_internal/__init__.py

@@ -1,5 +1,4 @@
 from .f3d_material_converter import *
-from .f3d import *
 from .sm64 import *
 from .oot import *  # is this really needed?
 from .panels import *

fast64_internal/f3d/__init__.py

@@ -26,4 +26,4 @@ def f3d_register(register_panel = True):
 def f3d_unregister(register_panel = True):
     for cls in reversed(classes):
         unregister_class(cls)
-    bsdf_converter_unregister()
+    bsdf_converter_unregister()