Merge branch 'develop' into enhancement/AY-1226_Use-AYON-entities

client/ayon_core/hosts/max/plugins/load/load_max_scene.py

@@ -1,10 +1,12 @@
 import os
-
+from qtpy import QtWidgets, QtCore
+from ayon_core.lib.attribute_definitions import EnumDef
 from ayon_core.hosts.max.api import lib
 from ayon_core.hosts.max.api.lib import (
     unique_namespace,
     get_namespace,
-    object_transform_set
+    object_transform_set,
+    is_headless
 )
 from ayon_core.hosts.max.api.pipeline import (
     containerise, get_previous_loaded_object,
@@ -14,6 +16,59 @@ from ayon_core.hosts.max.api.pipeline import (
 from ayon_core.pipeline import get_representation_path, load
 
 
+class MaterialDupOptionsWindow(QtWidgets.QDialog):
+    """The pop-up dialog allows users to choose material
+    duplicate options for importing Max objects when updating
+    or switching assets.
+    """
+    def __init__(self, material_options):
+        super(MaterialDupOptionsWindow, self).__init__()
+        self.setWindowFlags(self.windowFlags() | QtCore.Qt.FramelessWindowHint)
+
+        self.material_option = None
+        self.material_options = material_options
+
+        self.widgets = {
+            "label": QtWidgets.QLabel(
+                "Select material duplicate options before loading the max scene."),
+            "material_options_list": QtWidgets.QListWidget(),
+            "warning": QtWidgets.QLabel("No material options selected!"),
+            "buttons": QtWidgets.QWidget(),
+            "okButton": QtWidgets.QPushButton("Ok"),
+            "cancelButton": QtWidgets.QPushButton("Cancel")
+        }
+        for key, value in material_options.items():
+            item = QtWidgets.QListWidgetItem(value)
+            self.widgets["material_options_list"].addItem(item)
+            item.setData(QtCore.Qt.UserRole, key)
+        # Build buttons.
+        layout = QtWidgets.QHBoxLayout(self.widgets["buttons"])
+        layout.addWidget(self.widgets["okButton"])
+        layout.addWidget(self.widgets["cancelButton"])
+        # Build layout.
+        layout = QtWidgets.QVBoxLayout(self)
+        layout.addWidget(self.widgets["label"])
+        layout.addWidget(self.widgets["material_options_list"])
+        layout.addWidget(self.widgets["buttons"])
+
+        self.widgets["okButton"].pressed.connect(self.on_ok_pressed)
+        self.widgets["cancelButton"].pressed.connect(self.on_cancel_pressed)
+        self.widgets["material_options_list"].itemPressed.connect(
+            self.on_material_options_pressed)
+
+    def on_material_options_pressed(self, item):
+        self.material_option = item.data(QtCore.Qt.UserRole)
+
+    def on_ok_pressed(self):
+        if self.material_option is None:
+            self.widgets["warning"].setVisible(True)
+            return
+        self.close()
+
+    def on_cancel_pressed(self):
+        self.material_option = "promptMtlDups"
+        self.close()
+
 class MaxSceneLoader(load.LoaderPlugin):
     """Max Scene Loader."""
 
@@ -25,14 +80,31 @@ class MaxSceneLoader(load.LoaderPlugin):
     order = -8
     icon = "code-fork"
     color = "green"
+    mtl_dup_default = "promptMtlDups"
+    mtl_dup_enum_dict = {
+        "promptMtlDups": "Prompt on Duplicate Materials",
+        "useMergedMtlDups": "Use Incoming Material",
+        "useSceneMtlDups": "Use Scene Material",
+        "renameMtlDups": "Merge and Rename Incoming Material"
+        }
+    @classmethod
+    def get_options(cls, contexts):
+        return [
+            EnumDef("mtldup",
+                    items=cls.mtl_dup_enum_dict,
+                    default=cls.mtl_dup_default,
+                    label="Material Duplicate Options")
+        ]
 
-    def load(self, context, name=None, namespace=None, data=None):
+    def load(self, context, name=None, namespace=None, options=None):
         from pymxs import runtime as rt
+        mat_dup_options = options.get("mtldup", self.mtl_dup_default)
         path = self.filepath_from_context(context)
         path = os.path.normpath(path)
         # import the max scene by using "merge file"
         path = path.replace('\\', '/')
-        rt.MergeMaxFile(path, quiet=True, includeFullGroup=True)
+        rt.MergeMaxFile(path, rt.Name(mat_dup_options),
+                        quiet=True, includeFullGroup=True)
         max_objects = rt.getLastMergedNodes()
         max_object_names = [obj.name for obj in max_objects]
         # implement the OP/AYON custom attributes before load
@@ -67,7 +139,12 @@ class MaxSceneLoader(load.LoaderPlugin):
         for prev_max_obj in prev_max_objects:
             if rt.isValidNode(prev_max_obj):  # noqa
                 rt.Delete(prev_max_obj)
-        rt.MergeMaxFile(path, quiet=True)
+        material_option = self.mtl_dup_default
+        if not is_headless():
+            window = MaterialDupOptionsWindow(self.mtl_dup_enum_dict)
+            window.exec_()
+            material_option = window.material_option
+        rt.MergeMaxFile(path, rt.Name(material_option), quiet=True)
 
         current_max_objects = rt.getLastMergedNodes()
 

client/ayon_core/hosts/max/plugins/publish/validate_model_name.py

@@ -103,8 +103,8 @@ class ValidateModelName(pyblish.api.InstancePlugin,
         invalid = False
         compare = {
             "project": instance.context.data["projectName"],
-            "asset": instance.context.data["folderPath"],
+            "asset": instance.data["folderPath"],
-            "subset": instance.context.data["subset"],
+            "subset": instance.data["productName"]
         }
         for key, required_value in compare.items():
             if key in regex.groupindex:

client/ayon_core/tools/workfiles/control.py

@@ -572,6 +572,7 @@ class BaseWorkfileController(
                 workdir,
                 filename,
                 template_key,
+                src_filepath=representation_filepath
             )
         except Exception:
             failed = True