Merge branch 'develop' into feature/OP-5207_Global-host-color-management-activation

openpype/hosts/maya/plugins/create/create_render.py

@@ -181,16 +181,34 @@ class CreateRender(plugin.Creator):
 
         primary_pool = pool_setting["primary_pool"]
         sorted_pools = self._set_default_pool(list(pools), primary_pool)
-        cmds.addAttr(self.instance, longName="primaryPool",
-                     attributeType="enum",
-                     enumName=":".join(sorted_pools))
+        cmds.addAttr(
+            self.instance,
+            longName="primaryPool",
+            attributeType="enum",
+            enumName=":".join(sorted_pools)
+        )
+        cmds.setAttr(
+            "{}.primaryPool".format(self.instance),
+            0,
+            keyable=False,
+            channelBox=True
+        )
 
         pools = ["-"] + pools
         secondary_pool = pool_setting["secondary_pool"]
         sorted_pools = self._set_default_pool(list(pools), secondary_pool)
-        cmds.addAttr("{}.secondaryPool".format(self.instance),
-                     attributeType="enum",
-                     enumName=":".join(sorted_pools))
+        cmds.addAttr(
+            self.instance,
+            longName="secondaryPool",
+            attributeType="enum",
+            enumName=":".join(sorted_pools)
+        )
+        cmds.setAttr(
+            "{}.secondaryPool".format(self.instance),
+            0,
+            keyable=False,
+            channelBox=True
+        )
 
     def _create_render_settings(self):
         """Create instance settings."""
@@ -260,6 +278,12 @@ class CreateRender(plugin.Creator):
                                                default_priority)
             self.data["tile_priority"] = tile_priority
 
+            strict_error_checking = maya_submit_dl.get("strict_error_checking",
+                                                       True)
+            self.data["strict_error_checking"] = strict_error_checking
+
+            # Pool attributes should be last since they will be recreated when
+            # the deadline server changes.
             pool_setting = (self._project_settings["deadline"]
                                                   ["publish"]
                                                   ["CollectDeadlinePools"])
@@ -272,9 +296,6 @@ class CreateRender(plugin.Creator):
             secondary_pool = pool_setting["secondary_pool"]
             self.data["secondaryPool"] = self._set_default_pool(pool_names,
                                                                 secondary_pool)
-            strict_error_checking = maya_submit_dl.get("strict_error_checking",
-                                                       True)
-            self.data["strict_error_checking"] = strict_error_checking
 
         if muster_enabled:
             self.log.info(">>> Loading Muster credentials ...")

openpype/hosts/maya/plugins/load/load_reference.py

@@ -33,7 +33,7 @@ def preserve_modelpanel_cameras(container, log=None):
     panel_cameras = {}
     for panel in cmds.getPanel(type="modelPanel"):
         cam = cmds.ls(cmds.modelPanel(panel, query=True, camera=True),
-                      long=True)
+                      long=True)[0]
 
         # Often but not always maya returns the transform from the
         # modelPanel as opposed to the camera shape, so we convert it

openpype/hosts/maya/plugins/publish/collect_arnold_scene_source.py

@@ -35,13 +35,16 @@ class CollectArnoldSceneSource(pyblish.api.InstancePlugin):
         # camera.
         cameras = cmds.ls(type="camera", long=True)
         renderable = [c for c in cameras if cmds.getAttr("%s.renderable" % c)]
-        camera = renderable[0]
-        for node in instance.data["contentMembers"]:
-            camera_shapes = cmds.listRelatives(
-                node, shapes=True, type="camera"
-            )
-            if camera_shapes:
-                camera = node
-        instance.data["camera"] = camera
+        if renderable:
+            camera = renderable[0]
+            for node in instance.data["contentMembers"]:
+                camera_shapes = cmds.listRelatives(
+                    node, shapes=True, type="camera"
+                )
+                if camera_shapes:
+                    camera = node
+            instance.data["camera"] = camera
+        else:
+            self.log.debug("No renderable cameras found.")
 
         self.log.debug("data: {}".format(instance.data))

openpype/hosts/maya/plugins/publish/collect_render.py

@@ -336,7 +336,7 @@ class CollectMayaRender(pyblish.api.ContextPlugin):
                 context.data["system_settings"]["modules"]["deadline"]
             )
             if deadline_settings["enabled"]:
-                data["deadlineUrl"] = render_instance.data.get("deadlineUrl")
+                data["deadlineUrl"] = render_instance.data["deadlineUrl"]
 
             if self.sync_workfile_version:
                 data["version"] = context.data["version"]

openpype/hosts/maya/plugins/publish/validate_arnold_scene_source_cbid.py

@@ -70,5 +70,5 @@ class ValidateArnoldSceneSourceCbid(pyblish.api.InstancePlugin):
 
     @classmethod
     def repair(cls, instance):
-        for content_node, proxy_node in cls.get_invalid_couples(cls, instance):
-            lib.set_id(proxy_node, lib.get_id(content_node), overwrite=False)
+        for content_node, proxy_node in cls.get_invalid_couples(instance):
+            lib.set_id(proxy_node, lib.get_id(content_node), overwrite=True)

openpype/hosts/maya/plugins/publish/validate_rendersettings.py

@@ -364,6 +364,17 @@ class ValidateRenderSettings(pyblish.api.InstancePlugin):
             cmds.setAttr("defaultRenderGlobals.animation", True)
 
             # Repair prefix
+            if renderer == "arnold":
+                multipart = cmds.getAttr("defaultArnoldDriver.mergeAOVs")
+                if multipart:
+                    separator_variations = [
+                        "_<RenderPass>",
+                        "<RenderPass>_",
+                        "<RenderPass>",
+                    ]
+                    for variant in separator_variations:
+                        default_prefix = default_prefix.replace(variant, "")
+
             if renderer != "renderman":
                 node = render_attrs["node"]
                 prefix_attr = render_attrs["prefix"]