Merge branch 'develop' into bugfix/fps_retime_rounding_issue

client/ayon_core/host/dirmap.py

@@ -117,10 +117,7 @@ class HostDirmap(ABC):
             It checks if Site Sync is enabled and user chose to use local
             site, in that case configuration in Local Settings takes precedence
         """
-
-        dirmap_label = "{}-dirmap".format(self.host_name)
-        mapping_sett = self.project_settings[self.host_name].get(dirmap_label,
-                                                                 {})
+        mapping_sett = self.project_settings[self.host_name].get("dirmap", {})
         local_mapping = self._get_local_sync_dirmap()
         mapping_enabled = mapping_sett.get("enabled") or bool(local_mapping)
         if not mapping_enabled:

client/ayon_core/lib/path_templates.py

@@ -561,9 +561,6 @@ class FormattingPart:
 
         """
         key = self._template_base
-        if key in result.really_used_values:
-            result.add_output(result.really_used_values[key])
-            return result
 
         # ensure key is properly formed [({})] properly closed.
         if not self.validate_key_is_matched(key):

client/ayon_core/pipeline/publish/lib.py

@@ -717,6 +717,7 @@ def get_instance_staging_dir(instance):
     instance.data.update({
         "stagingDir": staging_dir_path,
         "stagingDir_persistent": staging_dir_info.persistent,
+        "stagingDir_custom": staging_dir_info.custom
     })
 
     return staging_dir_path

client/ayon_core/pipeline/staging_dir.py

@@ -12,6 +12,7 @@ from .tempdir import get_temp_dir
 class StagingDir:
     directory: str
     persistent: bool
+    custom: bool  # Whether the staging dir is a custom staging dir
 
 
 def get_staging_dir_config(
@@ -204,7 +205,8 @@ def get_staging_dir_info(
         dir_template = staging_dir_config["template"]["directory"]
         return StagingDir(
             dir_template.format_strict(ctx_data),
-            staging_dir_config["persistence"],
+            persistent=staging_dir_config["persistence"],
+            custom=True
         )
 
     # no config found but force an output
@@ -216,7 +218,8 @@ def get_staging_dir_info(
                 prefix=prefix,
                 suffix=suffix,
             ),
-            False,
+            persistent=False,
+            custom=False
         )
 
     return None

client/ayon_core/plugins/publish/collect_otio_subset_resources.py

@@ -178,7 +178,10 @@ class CollectOtioSubsetResources(
             repre = self._create_representation(
                 frame_start, frame_end, collection=collection)
 
-            if "review" in instance.data["families"]:
+            if (
+                not instance.data.get("otioReviewClips")
+                and "review" in instance.data["families"]
+            ):
                 review_repre = self._create_representation(
                 frame_start, frame_end, collection=collection,
                 delete=True, review=True)
@@ -197,7 +200,10 @@ class CollectOtioSubsetResources(
             repre = self._create_representation(
                 frame_start, frame_end, file=filename, trim=_trim)
 
-            if "review" in instance.data["families"]:
+            if (
+                not instance.data.get("otioReviewClips")
+                and "review" in instance.data["families"]
+            ):
                 review_repre = self._create_representation(
                     frame_start, frame_end,
                     file=filename, delete=True, review=True)

client/ayon_core/tools/launcher/ui/actions_widget.py

@@ -265,7 +265,7 @@ class ActionDelegate(QtWidgets.QStyledItemDelegate):
 
         if index.data(FORCE_NOT_OPEN_WORKFILE_ROLE):
             rect = QtCore.QRectF(
-                option.rect.x(), option.rect.height(), 5, 5)
+                option.rect.x(), option.rect.y() + option.rect.height(), 5, 5)
             painter.setPen(QtCore.Qt.NoPen)
             painter.setBrush(QtGui.QColor(200, 0, 0))
             painter.drawEllipse(rect)