From da5a0589e6a0e2af1f0971442d46a7b99cf91d97 Mon Sep 17 00:00:00 2001 From: JackP Date: Fri, 9 Feb 2024 15:50:06 +0000 Subject: [PATCH 1/8] feat: implemented has_unsaved_changes --- client/ayon_core/hosts/max/api/pipeline.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/client/ayon_core/hosts/max/api/pipeline.py b/client/ayon_core/hosts/max/api/pipeline.py index ff5ef0640b..b0c85c070b 100644 --- a/client/ayon_core/hosts/max/api/pipeline.py +++ b/client/ayon_core/hosts/max/api/pipeline.py @@ -61,8 +61,7 @@ class MaxHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost): lib.check_colorspace) def has_unsaved_changes(self): - # TODO: how to get it from 3dsmax? - return True + return rt.getSaveRequired() def get_workfile_extensions(self): return [".max"] From 8bd7fde33e7fc331c268bfa4142e39e94b2298c4 Mon Sep 17 00:00:00 2001 From: JackP Date: Fri, 9 Feb 2024 15:50:43 +0000 Subject: [PATCH 2/8] feat: save_scene to use host functions to check if saving is required --- .../hosts/max/plugins/publish/save_scene.py | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/client/ayon_core/hosts/max/plugins/publish/save_scene.py b/client/ayon_core/hosts/max/plugins/publish/save_scene.py index a40788ab41..37ff38bc59 100644 --- a/client/ayon_core/hosts/max/plugins/publish/save_scene.py +++ b/client/ayon_core/hosts/max/plugins/publish/save_scene.py @@ -1,11 +1,9 @@ import pyblish.api -import os +from openpype.pipeline import registered_host class SaveCurrentScene(pyblish.api.ContextPlugin): - """Save current scene - - """ + """Save current scene""" label = "Save current file" order = pyblish.api.ExtractorOrder - 0.49 @@ -13,9 +11,13 @@ class SaveCurrentScene(pyblish.api.ContextPlugin): families = ["maxrender", "workfile"] def process(self, context): - from pymxs import runtime as rt - folder = rt.maxFilePath - file = rt.maxFileName - current = os.path.join(folder, file) - assert context.data["currentFile"] == current - rt.saveMaxFile(current) + host = registered_host() + current_file = host.get_current_workfile() + + assert context.data["currentFile"] == current_file + + if host.workfile_has_unsaved_changes(): + self.log.info(f"Saving current file: {current_file}") + host.save_workfile(current_file) + else: + self.log.debug("No unsaved changes, skipping file save..")") \ No newline at end of file From 3cddbb809e581cf27f2ee562f398af99aba45b8f Mon Sep 17 00:00:00 2001 From: JackP Date: Fri, 9 Feb 2024 15:51:04 +0000 Subject: [PATCH 3/8] feat: startup.ms to restore default view menu --- client/ayon_core/hosts/max/startup/startup.ms | 3 +++ 1 file changed, 3 insertions(+) diff --git a/client/ayon_core/hosts/max/startup/startup.ms b/client/ayon_core/hosts/max/startup/startup.ms index b80ead4b74..4c597901f3 100644 --- a/client/ayon_core/hosts/max/startup/startup.ms +++ b/client/ayon_core/hosts/max/startup/startup.ms @@ -8,5 +8,8 @@ local pythonpath = systemTools.getEnvVariable "MAX_PYTHONPATH" systemTools.setEnvVariable "PYTHONPATH" pythonpath + /*opens the create menu on startup to ensure users are presented with a useful default view.*/ + max create mode + python.ExecuteFile startup ) \ No newline at end of file From 1d9a4dd737b12a33a67acdf66ad75e3e9fad764d Mon Sep 17 00:00:00 2001 From: JackP Date: Fri, 9 Feb 2024 15:56:31 +0000 Subject: [PATCH 4/8] refactor: replaced has_unsaved_changes with workfile_has_unsaved_changes --- client/ayon_core/hosts/max/api/pipeline.py | 1 + 1 file changed, 1 insertion(+) diff --git a/client/ayon_core/hosts/max/api/pipeline.py b/client/ayon_core/hosts/max/api/pipeline.py index b0c85c070b..5f20891329 100644 --- a/client/ayon_core/hosts/max/api/pipeline.py +++ b/client/ayon_core/hosts/max/api/pipeline.py @@ -61,6 +61,7 @@ class MaxHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost): lib.check_colorspace) def has_unsaved_changes(self): + def workfile_has_unsaved_changes(self): return rt.getSaveRequired() def get_workfile_extensions(self): From 57815d19a1e9e42d7abe24721b121d6eb1b5ff45 Mon Sep 17 00:00:00 2001 From: JackP Date: Fri, 9 Feb 2024 16:03:02 +0000 Subject: [PATCH 5/8] chore: removed has_unsaved_changes --- client/ayon_core/hosts/max/api/pipeline.py | 1 - 1 file changed, 1 deletion(-) diff --git a/client/ayon_core/hosts/max/api/pipeline.py b/client/ayon_core/hosts/max/api/pipeline.py index 5f20891329..2dc3eb6da8 100644 --- a/client/ayon_core/hosts/max/api/pipeline.py +++ b/client/ayon_core/hosts/max/api/pipeline.py @@ -60,7 +60,6 @@ class MaxHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost): rt.callbacks.addScript(rt.Name('filePostOpen'), lib.check_colorspace) - def has_unsaved_changes(self): def workfile_has_unsaved_changes(self): return rt.getSaveRequired() From d80ba2bac486711a41d1f889d4e0be3386c463cf Mon Sep 17 00:00:00 2001 From: Sponge96 Date: Wed, 14 Feb 2024 08:50:08 +0000 Subject: [PATCH 6/8] fix: removed artifact syntax Co-authored-by: Kayla Man <64118225+moonyuet@users.noreply.github.com> --- client/ayon_core/hosts/max/plugins/publish/save_scene.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/ayon_core/hosts/max/plugins/publish/save_scene.py b/client/ayon_core/hosts/max/plugins/publish/save_scene.py index 37ff38bc59..7961631b2a 100644 --- a/client/ayon_core/hosts/max/plugins/publish/save_scene.py +++ b/client/ayon_core/hosts/max/plugins/publish/save_scene.py @@ -20,4 +20,4 @@ class SaveCurrentScene(pyblish.api.ContextPlugin): self.log.info(f"Saving current file: {current_file}") host.save_workfile(current_file) else: - self.log.debug("No unsaved changes, skipping file save..")") \ No newline at end of file + self.log.debug("No unsaved changes, skipping file save..") \ No newline at end of file From e43e2344195d57e53a064d2422e547f47a730f67 Mon Sep 17 00:00:00 2001 From: Sponge96 Date: Wed, 14 Feb 2024 08:50:45 +0000 Subject: [PATCH 7/8] refactor: replaced OP imports with ayon-core Co-authored-by: Kayla Man <64118225+moonyuet@users.noreply.github.com> --- client/ayon_core/hosts/max/plugins/publish/save_scene.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/ayon_core/hosts/max/plugins/publish/save_scene.py b/client/ayon_core/hosts/max/plugins/publish/save_scene.py index 7961631b2a..1c59335ceb 100644 --- a/client/ayon_core/hosts/max/plugins/publish/save_scene.py +++ b/client/ayon_core/hosts/max/plugins/publish/save_scene.py @@ -1,5 +1,5 @@ import pyblish.api -from openpype.pipeline import registered_host +from ayon_core.pipeline import registered_host class SaveCurrentScene(pyblish.api.ContextPlugin): From a36bd63da7645d2afe90d27c170de4d66fca574a Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Wed, 14 Feb 2024 17:15:05 +0800 Subject: [PATCH 8/8] some style tweaks on pipeline --- client/ayon_core/hosts/max/api/pipeline.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/ayon_core/hosts/max/api/pipeline.py b/client/ayon_core/hosts/max/api/pipeline.py index c9b74cea9e..c26e697429 100644 --- a/client/ayon_core/hosts/max/api/pipeline.py +++ b/client/ayon_core/hosts/max/api/pipeline.py @@ -59,9 +59,9 @@ class MaxHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost): rt.callbacks.addScript(rt.Name('filePostOpen'), lib.check_colorspace) - + rt.callbacks.addScript(rt.Name('postWorkspaceChange'), - self._deferred_menu_creation) + self._deferred_menu_creation) def workfile_has_unsaved_changes(self): return rt.getSaveRequired()