Finalized module reloading (hopefully)

Author: MrClock

Arma3ObjectBuilder/__init__.py

@@ -15,10 +15,16 @@
 import os
 
 if "bpy" in locals():
-    utilities.reload()
-    io.reload()
-    props.reload()
-    ui.reload()
+    from importlib import reload
+    
+    if "utilities" in locals():
+        reload(utilities)
+    if "io" in locals():
+        reload(io)
+    if "props" in locals():
+        reload(props)
+    if "ui" in locals():
+        reload(ui)
 
 import bpy
 

Arma3ObjectBuilder/io/__init__.py

@@ -1,3 +1,44 @@
+if "binary_handler" in locals():
+    from importlib import reload
+    
+    if "binary_handler" in locals():
+        reload(binary_handler)
+    if "compression" in locals():
+        reload(compression)
+    if "data_asc" in locals():
+        reload(data_asc)
+    if "data_p3d" in locals():
+        reload(data_p3d)
+    if "data_rap" in locals():
+        reload(data_rap)
+    if "data_rtm" in locals():
+        reload(data_rtm)
+    if "data_tbcsv" in locals():
+        reload(data_tbcsv)
+    if "export_asc" in locals():
+        reload(export_asc)
+    if "export_mcfg" in locals():
+        reload(export_mcfg)
+    if "export_p3d" in locals():
+        reload(export_p3d)
+    if "export_rtm" in locals():
+        reload(export_rtm)
+    if "export_tbcsv" in locals():
+        reload(export_tbcsv)
+    if "import_armature" in locals():
+        reload(import_armature)
+    if "import_asc" in locals():
+        reload(import_asc)
+    if "import_mcfg" in locals():
+        reload(import_mcfg)
+    if "import_p3d" in locals():
+        reload(import_p3d)
+    if "import_rtm" in locals():
+        reload(import_rtm)
+    if "import_tbcsv" in locals():
+        reload(import_tbcsv)
+
+
 from . import binary_handler
 from . import compression
 from . import data_asc
@@ -16,26 +57,3 @@
 from . import import_p3d
 from . import import_rtm
 from . import import_tbcsv
-
-
-def reload():
-    from importlib import reload
-
-    reload(binary_handler)
-    reload(compression)
-    reload(data_asc)
-    reload(data_p3d)
-    reload(data_rap)
-    reload(data_rtm)
-    reload(data_tbcsv)
-    reload(export_asc)
-    reload(export_mcfg)
-    reload(export_p3d)
-    reload(export_rtm)
-    reload(export_tbcsv)
-    reload(import_armature)
-    reload(import_asc)
-    reload(import_mcfg)
-    reload(import_p3d)
-    reload(import_rtm)
-    reload(import_tbcsv)

Arma3ObjectBuilder/props/__init__.py

@@ -1,13 +1,17 @@
+if "object" in locals():
+    from importlib import reload
+    
+    if "action" in locals():
+        reload(action)
+    if "material" in locals():
+        reload(material)
+    if "object" in locals():
+        reload(object)
+    if "scene" in locals():
+        reload(scene)
+
+
 from . import action
 from . import material
 from . import object
 from . import scene
-
-
-def reload():
-    from importlib import reload
-
-    reload(action)
-    reload(material)
-    reload(object)
-    reload(scene)

Arma3ObjectBuilder/ui/__init__.py

@@ -1,3 +1,46 @@
+if "props_object_mesh" in locals():
+    from importlib import reload
+
+    if "import_export_armature" in locals():
+        reload(import_export_armature)
+    if "import_export_asc" in locals():
+        reload(import_export_asc)
+    if "import_export_mcfg" in locals():
+        reload(import_export_mcfg)
+    if "import_export_p3d" in locals():
+        reload(import_export_p3d)
+    if "import_export_rtm" in locals():
+        reload(import_export_rtm)
+    if "import_export_tbcsv" in locals():
+        reload(import_export_tbcsv)
+    if "props_action" in locals():
+        reload(props_action)
+    if "props_material" in locals():
+        reload(props_material)
+    if "props_object_mesh" in locals():
+        reload(props_object_mesh)
+    if "tool_outliner" in locals():
+        reload(tool_outliner)
+    if "tool_hitpoint" in locals():
+        reload(tool_hitpoint)
+    if "tool_mass" in locals():
+        reload(tool_mass)
+    if "tool_materials" in locals():
+        reload(tool_materials)
+    if "tool_paths" in locals():
+        reload(tool_paths)
+    if "tool_proxies" in locals():
+        reload(tool_proxies)
+    if "tool_rigging" in locals():
+        reload(tool_rigging)
+    if "tool_scripts" in locals():
+        reload(tool_scripts)
+    if "tool_utilities" in locals():
+        reload(tool_utilities)
+    if "tool_validation" in locals():
+        reload(tool_validation)
+
+
 from . import import_export_armature
 from . import import_export_asc
 from . import import_export_mcfg
@@ -17,27 +60,3 @@
 from . import tool_scripts
 from . import tool_utilities
 from . import tool_validation
-
-
-def reload():
-    from importlib import reload
-
-    reload(import_export_armature)
-    reload(import_export_asc)
-    reload(import_export_mcfg)
-    reload(import_export_p3d)
-    reload(import_export_rtm)
-    reload(import_export_tbcsv)
-    reload(props_action)
-    reload(props_material)
-    reload(props_object_mesh)
-    reload(tool_outliner)
-    reload(tool_hitpoint)
-    reload(tool_mass)
-    reload(tool_materials)
-    reload(tool_paths)
-    reload(tool_proxies)
-    reload(tool_rigging)
-    reload(tool_scripts)
-    reload(tool_utilities)
-    reload(tool_validation)

Arma3ObjectBuilder/utilities/__init__.py

@@ -1,3 +1,38 @@
+if "data" in locals():
+    from importlib import reload
+    
+    if "data" in locals():
+        reload(data)
+    if "logger" in locals():
+        reload(logger)
+    if "compat" in locals():
+        reload(compat)
+    if "clouds" in locals():
+        reload(clouds)
+    if "colors" in locals():
+        reload(colors)
+    if "proxy" in locals():
+        reload(proxy)
+    if "renaming" in locals():
+        reload(renaming)
+    if "generic" in locals():
+        reload(generic)
+    if "validator" in locals():
+        reload(validator)
+    if "flags" in locals():
+        reload(flags)
+    if "lod" in locals():
+        reload(lod)
+    if "masses" in locals():
+        reload(masses)
+    if "outliner" in locals():
+        reload(outliner)
+    if "rigging" in locals():
+        reload(rigging)
+    if "structure" in locals():
+        reload(structure)
+
+
 # In order of dependency
 from . import data
 from . import logger
@@ -14,23 +49,3 @@
 from . import outliner
 from . import rigging
 from . import structure
-
-
-def reload():
-    from importlib import reload
-
-    reload(data)
-    reload(logger)
-    reload(compat)
-    reload(clouds)
-    reload(colors)
-    reload(proxy)
-    reload(renaming)
-    reload(generic)
-    reload(validator)
-    reload(flags)
-    reload(lod)
-    reload(masses)
-    reload(outliner)
-    reload(rigging)
-    reload(structure)