From 679c678fa3b286429de09b1cd1695cf55e3c23ff Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 29 Nov 2021 17:29:10 +0100
Subject: [PATCH 1/2] moved action to openpype/modules

---
 .../modules/default_modules/settings_module/__init__.py  | 9 ---------
 .../modules/{default_modules => }/launcher_action.py     | 0
 .../{default_modules => }/project_manager_action.py      | 0
 .../settings_module => }/settings_action.py              | 0
 .../{default_modules => }/standalonepublish_action.py    | 0
 5 files changed, 9 deletions(-)
 delete mode 100644 openpype/modules/default_modules/settings_module/__init__.py
 rename openpype/modules/{default_modules => }/launcher_action.py (100%)
 rename openpype/modules/{default_modules => }/project_manager_action.py (100%)
 rename openpype/modules/{default_modules/settings_module => }/settings_action.py (100%)
 rename openpype/modules/{default_modules => }/standalonepublish_action.py (100%)

diff --git a/openpype/modules/default_modules/settings_module/__init__.py b/openpype/modules/default_modules/settings_module/__init__.py
deleted file mode 100644
index 95510eba9da..00000000000
--- a/openpype/modules/default_modules/settings_module/__init__.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from .settings_action import (
-    LocalSettingsAction,
-    SettingsAction
-)
-
-__all__ = (
-    "LocalSettingsAction",
-    "SettingsAction"
-)
diff --git a/openpype/modules/default_modules/launcher_action.py b/openpype/modules/launcher_action.py
similarity index 100%
rename from openpype/modules/default_modules/launcher_action.py
rename to openpype/modules/launcher_action.py
diff --git a/openpype/modules/default_modules/project_manager_action.py b/openpype/modules/project_manager_action.py
similarity index 100%
rename from openpype/modules/default_modules/project_manager_action.py
rename to openpype/modules/project_manager_action.py
diff --git a/openpype/modules/default_modules/settings_module/settings_action.py b/openpype/modules/settings_action.py
similarity index 100%
rename from openpype/modules/default_modules/settings_module/settings_action.py
rename to openpype/modules/settings_action.py
diff --git a/openpype/modules/default_modules/standalonepublish_action.py b/openpype/modules/standalonepublish_action.py
similarity index 100%
rename from openpype/modules/default_modules/standalonepublish_action.py
rename to openpype/modules/standalonepublish_action.py

From f12ef3aea82200b8222fccb5af0756d861ff18c3 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 29 Nov 2021 17:30:38 +0100
Subject: [PATCH 2/2] added import of default modules

---
 openpype/modules/base.py | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/openpype/modules/base.py b/openpype/modules/base.py
index 6f9ddb2fd4c..7ecfeae7bd5 100644
--- a/openpype/modules/base.py
+++ b/openpype/modules/base.py
@@ -271,9 +271,29 @@ def _load_modules():
 
     log = PypeLogger.get_logger("ModulesLoader")
 
+    # Import default modules imported from 'openpype.modules'
+    for default_module_name in (
+        "settings_action",
+        "launcher_action",
+        "project_manager_action",
+        "standalonepublish_action",
+    ):
+        try:
+            default_module = __import__(
+                "openpype.modules.{}".format(default_module_name),
+                fromlist=("", )
+            )
+            setattr(openpype_modules, default_module_name, default_module)
+
+        except Exception:
+            msg = (
+                "Failed to import default module '{}'."
+            ).format(default_module_name)
+            log.error(msg, exc_info=True)
+
     # Look for OpenPype modules in paths defined with `get_module_dirs`
+    #   - dynamically imported OpenPype modules and addons
     dirpaths = get_module_dirs()
-
     for dirpath in dirpaths:
         if not os.path.exists(dirpath):
             log.warning((