Merge branch 'develop' into enhancement/OP-7592_expose_write_knobs

openpype/lib/transcoding.py

@@ -110,8 +110,9 @@ def get_oiio_info_for_input(filepath, logger=None, subimages=False):
             if line == "</ImageSpec>":
                 subimages_lines.append(lines)
                 lines = []
+                xml_started = False
 
-    if not xml_started:
+    if not subimages_lines:
         raise ValueError(
             "Failed to read input file \"{}\".\nOutput:\n{}".format(
                 filepath, output

openpype/plugins/publish/collect_anatomy_instance_data.py

@@ -200,9 +200,15 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
             self._fill_task_data(instance, project_task_types, anatomy_data)
 
             # Define version
+            version_number = None
             if self.follow_workfile_version:
                 version_number = context.data("version")
-            else:
+
+            # Even if 'follow_workfile_version' is enabled, it may not be set
+            #   because workfile version was not collected to 'context.data'
+            # - that can happen e.g. in 'traypublisher' or other hosts without
+            #   a workfile
+            if version_number is None:
                 version_number = instance.data.get("version")
 
             # use latest version (+1) if already any exist

openpype/settings/ayon_settings.py

@@ -1291,12 +1291,6 @@ def _convert_global_project_settings(ayon_settings, output, default_settings):
             for extract_burnin_def in extract_burnin_defs
         }
 
-    ayon_integrate_hero = ayon_publish["IntegrateHeroVersion"]
-    for profile in ayon_integrate_hero["template_name_profiles"]:
-        if "product_types" not in profile:
-            break
-        profile["families"] = profile.pop("product_types")
-
     if "IntegrateProductGroup" in ayon_publish:
         subset_group = ayon_publish.pop("IntegrateProductGroup")
         subset_group_profiles = subset_group.pop("product_grouping_profiles")