Merge branch '2.x/develop' into feature/451-Fusion_basic_integration

pype/hooks/celaction/prelaunch.py

@@ -57,8 +57,8 @@ class CelactionPrelaunchHook(PypeHook):
         self.log.info(f"Work dir is: `{workdir}`")
 
         # get last version of workfile
-        workfile_last = get_last_version_from_path(
-            workdir, workfile.split(version))
+        workfile_last = env.get("AVALON_LAST_WORKFILE")
+        self.log.debug(f"_ workfile_last: `{workfile_last}`")
 
         if workfile_last:
             workfile = workfile_last

pype/plugins/ftrack/publish/integrate_ftrack_instances.py

@@ -30,7 +30,8 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
                       'audio': 'audio',
                       'workfile': 'scene',
                       'animation': 'cache',
-                      'image': 'img'
+                      'image': 'img',
+                      'reference': 'reference'
                       }
 
     def process(self, instance):

pype/plugins/global/publish/extract_hierarchy_avalon.py

@@ -78,6 +78,12 @@ class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin):
                 if entity:
                     # Do not override data, only update
                     cur_entity_data = entity.get("data") or {}
+                    new_tasks = data.pop("tasks", [])
+                    if "tasks" in cur_entity_data and new_tasks:
+                        for task_name in new_tasks:
+                            if task_name not in cur_entity_data["tasks"]:
+                                cur_entity_data["tasks"].append(task_name)
+
                     cur_entity_data.update(data)
                     data = cur_entity_data
                 else:

pype/plugins/standalonepublisher/publish/collect_clip_instances.py

@@ -18,15 +18,15 @@ class CollectClipInstances(pyblish.api.InstancePlugin):
         "referenceMain": {
             "family": "review",
             "families": ["review", "ftrack"],
-            "ftrackFamily": "review",
+            # "ftrackFamily": "review",
             "extension": ".mp4"
         },
         "audioMain": {
             "family": "audio",
             "families": ["ftrack"],
-            "ftrackFamily": "audio",
+            # "ftrackFamily": "audio",
             "extension": ".wav",
-            "version": 1
+            # "version": 1
         },
         "shotMain": {
             "family": "shot",

pype/tools/launcher/widgets.py

@@ -85,6 +85,7 @@ class ActionBar(QtWidgets.QWidget):
         view.setViewMode(QtWidgets.QListView.IconMode)
         view.setResizeMode(QtWidgets.QListView.Adjust)
         view.setSelectionMode(QtWidgets.QListView.NoSelection)
+        view.setEditTriggers(QtWidgets.QListView.NoEditTriggers)
         view.setWrapping(True)
         view.setGridSize(QtCore.QSize(70, 75))
         view.setIconSize(QtCore.QSize(30, 30))
@@ -206,6 +207,7 @@ class TasksWidget(QtWidgets.QWidget):
 
         view = QtWidgets.QTreeView(self)
         view.setIndentation(0)
+        view.setEditTriggers(QtWidgets.QTreeView.NoEditTriggers)
         model = TaskModel(self.dbcon)
         view.setModel(model)