Merge branch 'develop' into feature/OP-5548_Fusion-Deadline-and-publish

openpype/hosts/unreal/addon.py

@@ -23,9 +23,10 @@ class UnrealAddon(OpenPypeModule, IHostAddon):
             UNREAL_ROOT_DIR, "integration", f"UE_{ue_version}", "Ayon"
         )
         if not Path(unreal_plugin_path).exists():
-            if compatible_versions := get_compatible_integration(
+            compatible_versions = get_compatible_integration(
                 ue_version, Path(UNREAL_ROOT_DIR) / "integration"
-            ):
+            )
+            if compatible_versions:
                 unreal_plugin_path = compatible_versions[-1] / "Ayon"
                 unreal_plugin_path = unreal_plugin_path.as_posix()
 

openpype/pipeline/workfile/build_workfile.py

@@ -186,7 +186,7 @@ class BuildWorkfile:
 
         if link_context_profiles:
             # Find and append linked assets if preset has set linked mapping
-            link_assets = get_linked_assets(current_asset_entity)
+            link_assets = get_linked_assets(project_name, current_asset_entity)
             if link_assets:
                 assets.extend(link_assets)
 

openpype/vendor/python/common/scriptsmenu/scriptsmenu.py

@@ -19,9 +19,9 @@ class ScriptsMenu(QtWidgets.QMenu):
 
         Args:
             title (str): the name of the root menu which will be created
-        
+
             parent (QtWidgets.QObject) : the QObject to parent the menu to
-        
+
         Returns:
             None
 
@@ -94,7 +94,7 @@ class ScriptsMenu(QtWidgets.QMenu):
             parent(QtWidgets.QWidget): the object to parent the menu to
 
             title(str): the title of the menu
-        
+
         Returns:
              QtWidget.QMenu instance
         """
@@ -111,7 +111,7 @@ class ScriptsMenu(QtWidgets.QMenu):
         return menu
 
     def add_script(self, parent, title, command, sourcetype, icon=None,
-                   tags=None, label=None, tooltip=None):
+                   tags=None, label=None, tooltip=None, shortcut=None):
         """Create an action item which runs a script when clicked
 
         Args:
@@ -134,6 +134,8 @@ class ScriptsMenu(QtWidgets.QMenu):
 
             tooltip (str): A tip for the user about the usage fo the tool
 
+            shortcut (str): A shortcut to run the command
+
         Returns:
             QtWidget.QAction instance
 
@@ -166,6 +168,9 @@ class ScriptsMenu(QtWidgets.QMenu):
             raise RuntimeError("Script action can't be "
                                "processed: {}".format(e))
 
+        if shortcut:
+            script_action.setShortcut(shortcut)
+
         if icon:
             iconfile = os.path.expandvars(icon)
             script_action.iconfile = iconfile
@@ -253,7 +258,7 @@ class ScriptsMenu(QtWidgets.QMenu):
 
     def _update_search(self, search):
         """Hide all the samples which do not match the user's import
-        
+
         Returns:
             None