From 4ef3d225e8711329c7c03b2b282ad6c57b11ece4 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 20 Aug 2020 09:57:34 +0200 Subject: [PATCH 1/5] disable editing of items in tasks and actions --- pype/tools/launcher/widgets.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pype/tools/launcher/widgets.py b/pype/tools/launcher/widgets.py index 7ab0a3f8ea..894dde3926 100644 --- a/pype/tools/launcher/widgets.py +++ b/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) From 8f7509d8249a6cc99ce59c9b0b0a1762cb3eab43 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Thu, 20 Aug 2020 11:49:17 +0100 Subject: [PATCH 2/5] celaction last workfile was not detecting last workfile version properly --- pype/hooks/celaction/prelaunch.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pype/hooks/celaction/prelaunch.py b/pype/hooks/celaction/prelaunch.py index 58b1ac8a23..c8541a9bc3 100644 --- a/pype/hooks/celaction/prelaunch.py +++ b/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 From f41bf542e8adddf372d142a3c97f912cb060cc70 Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Thu, 20 Aug 2020 15:59:16 +0200 Subject: [PATCH 3/5] simplify default --- .../standalonepublisher/publish/collect_clip_instances.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pype/plugins/standalonepublisher/publish/collect_clip_instances.py b/pype/plugins/standalonepublisher/publish/collect_clip_instances.py index 3d9773d0b2..a7af8df143 100644 --- a/pype/plugins/standalonepublisher/publish/collect_clip_instances.py +++ b/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", From 016f529a90ef5ece370a1e6f1636805cc06c4876 Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Thu, 20 Aug 2020 15:59:33 +0200 Subject: [PATCH 4/5] add reference family to ftrack --- pype/plugins/ftrack/publish/integrate_ftrack_instances.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pype/plugins/ftrack/publish/integrate_ftrack_instances.py b/pype/plugins/ftrack/publish/integrate_ftrack_instances.py index f5d7689678..9ef82cbc4b 100644 --- a/pype/plugins/ftrack/publish/integrate_ftrack_instances.py +++ b/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): From 2a08d0e44f038a65debe9ec6a96a184c8bfb80d0 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 21 Aug 2020 11:13:59 +0200 Subject: [PATCH 5/5] taks are update not overriden during extract hierarchy plugin --- pype/plugins/global/publish/extract_hierarchy_avalon.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pype/plugins/global/publish/extract_hierarchy_avalon.py b/pype/plugins/global/publish/extract_hierarchy_avalon.py index ab8226f6ef..7cea825541 100644 --- a/pype/plugins/global/publish/extract_hierarchy_avalon.py +++ b/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: