Merge branch 'develop' into enhancement/collect_scene_loaded_versions_add_more_hosts

client/ayon_core/pipeline/farm/pyblish_functions.py

@@ -591,22 +591,6 @@ def create_instances_for_aov(
     # AOV product of its own.
 
     log = Logger.get_logger("farm_publishing")
-    additional_color_data = {
-        "renderProducts": instance.data["renderProducts"],
-        "colorspaceConfig": instance.data["colorspaceConfig"],
-        "display": instance.data["colorspaceDisplay"],
-        "view": instance.data["colorspaceView"]
-    }
-
-    # Get templated path from absolute config path.
-    anatomy = instance.context.data["anatomy"]
-    colorspace_template = instance.data["colorspaceConfig"]
-    try:
-        additional_color_data["colorspaceTemplate"] = remap_source(
-            colorspace_template, anatomy)
-    except ValueError as e:
-        log.warning(e)
-        additional_color_data["colorspaceTemplate"] = colorspace_template
 
     # if there are product to attach to and more than one AOV,
     # we cannot proceed.
@@ -618,6 +602,29 @@ def create_instances_for_aov(
             "attaching multiple AOVs or renderable cameras to "
             "product is not supported yet.")
 
+    additional_data = {
+        "renderProducts": instance.data["renderProducts"],
+    }
+
+    # Collect color management data if present
+    colorspace_config = instance.data.get("colorspaceConfig")
+    if colorspace_config:
+        additional_data.update({
+            "colorspaceConfig": colorspace_config,
+            # Display/View are optional
+            "display": instance.data.get("colorspaceDisplay"),
+            "view": instance.data.get("colorspaceView")
+        })
+
+        # Get templated path from absolute config path.
+        anatomy = instance.context.data["anatomy"]
+        try:
+            additional_data["colorspaceTemplate"] = remap_source(
+                colorspace_config, anatomy)
+        except ValueError as e:
+            log.warning(e)
+            additional_data["colorspaceTemplate"] = colorspace_config
+
     # create instances for every AOV we found in expected files.
     # NOTE: this is done for every AOV and every render camera (if
     #       there are multiple renderable cameras in scene)
@@ -625,7 +632,7 @@ def create_instances_for_aov(
         instance,
         skeleton,
         aov_filter,
-        additional_color_data,
+        additional_data,
         skip_integration_repre_list,
         do_not_add_review,
         frames_to_render
@@ -936,16 +943,28 @@ def _create_instances_for_aov(
             "stagingDir": staging_dir,
             "fps": new_instance.get("fps"),
             "tags": ["review"] if preview else [],
-            "colorspaceData": {
+        }
+
+        if colorspace and additional_data["colorspaceConfig"]:
+            # Only apply colorspace data if the image has a colorspace
+            colorspace_data: dict = {
                 "colorspace": colorspace,
                 "config": {
                     "path": additional_data["colorspaceConfig"],
                     "template": additional_data["colorspaceTemplate"]
                 },
-                "display": additional_data["display"],
-                "view": additional_data["view"]
             }
-        }
+            # Display/View are optional
+            display = additional_data.get("display")
+            if display:
+                colorspace_data["display"] = display
+            view = additional_data.get("view")
+            if view:
+                colorspace_data["view"] = view
+
+            rep["colorspaceData"] = colorspace_data
+        else:
+            log.debug("No colorspace data for representation: {}".format(rep))
 
         # support conversion from tiled to scanline
         if instance.data.get("convertToScanline"):

client/ayon_core/plugins/publish/integrate.py

@@ -457,6 +457,9 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
             else:
                 version_data[key] = value
 
+        host_name = instance.context.data["hostName"]
+        version_data["host_name"] = host_name
+
         version_entity = new_version_entity(
             version_number,
             product_entity["id"],

client/ayon_core/tools/publisher/widgets/card_view_widgets.py

@@ -212,6 +212,11 @@ class ContextCardWidget(CardWidget):
         icon_widget.setObjectName("ProductTypeIconLabel")
 
         label_widget = QtWidgets.QLabel(f"<span>{CONTEXT_LABEL}</span>", self)
+        # HTML text will cause that label start catch mouse clicks
+        # - disabling with changing interaction flag
+        label_widget.setTextInteractionFlags(
+            QtCore.Qt.NoTextInteraction
+        )
 
         icon_layout = QtWidgets.QHBoxLayout()
         icon_layout.setContentsMargins(5, 5, 5, 5)

client/ayon_core/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring AYON addon 'core' version."""
-__version__ = "1.6.9+dev"
+__version__ = "1.6.10+dev"