Merge branch 'develop' into enhancement/maya_yeti_rig_load_create_cache_instance

client/ayon_core/hosts/houdini/plugins/load/load_alembic.py

@@ -45,33 +45,11 @@ class AbcLoader(load.LoaderPlugin):
         alembic = container.createNode("alembic", node_name=node_name)
         alembic.setParms({"fileName": file_path})
 
-        # Add unpack node
-        unpack_name = "unpack_{}".format(name)
-        unpack = container.createNode("unpack", node_name=unpack_name)
-        unpack.setInput(0, alembic)
-        unpack.setParms({"transfer_attributes": "path"})
+        # Position nodes nicely
+        container.moveToGoodPosition()
+        container.layoutChildren()
 
-        # Add normal to points
-        # Order of menu ['point', 'vertex', 'prim', 'detail']
-        normal_name = "normal_{}".format(name)
-        normal_node = container.createNode("normal", node_name=normal_name)
-        normal_node.setParms({"type": 0})
-
-        normal_node.setInput(0, unpack)
-
-        null = container.createNode("null", node_name="OUT")
-        null.setInput(0, normal_node)
-
-        # Ensure display flag is on the Alembic input node and not on the OUT
-        # node to optimize "debug" displaying in the viewport.
-        alembic.setDisplayFlag(True)
-
-        # Set new position for unpack node else it gets cluttered
-        nodes = [container, alembic, unpack, normal_node, null]
-        for nr, node in enumerate(nodes):
-            node.setPosition([0, (0 - nr)])
-
-        self[:] = nodes
+        nodes = [container, alembic]
 
         return pipeline.containerise(
             node_name,

client/ayon_core/hosts/maya/api/render_setup_tools.py

@@ -19,7 +19,7 @@ from .lib import pairwise
 
 
 @contextlib.contextmanager
-def _allow_export_from_render_setup_layer():
+def allow_export_from_render_setup_layer():
     """Context manager to override Maya settings to allow RS layer export"""
     try:
 
@@ -102,7 +102,7 @@ def export_in_rs_layer(path, nodes, export=None):
         cmds.disconnectAttr(src, dest)
 
     # Export Selected
-    with _allow_export_from_render_setup_layer():
+    with allow_export_from_render_setup_layer():
         cmds.select(nodes, noExpand=True)
         if export:
             export()

client/ayon_core/hosts/maya/plugins/publish/collect_file_dependencies.py

@@ -12,7 +12,7 @@ class CollectFileDependencies(pyblish.api.ContextPlugin):
     families = ["renderlayer"]
 
     @classmethod
-    def apply_settings(cls, project_settings, system_settings):
+    def apply_settings(cls, project_settings):
         # Disable plug-in if not used for deadline submission anyway
         settings = project_settings["deadline"]["publish"]["MayaSubmitDeadline"]  # noqa
         cls.enabled = settings.get("asset_dependencies", True)

client/ayon_core/hosts/maya/plugins/publish/extract_redshift_proxy.py

@@ -5,7 +5,13 @@ import os
 from maya import cmds
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.maya.api.lib import maintained_selection
+from ayon_core.hosts.maya.api.lib import (
+    maintained_selection,
+    renderlayer
+)
+from ayon_core.hosts.maya.api.render_setup_tools import (
+    allow_export_from_render_setup_layer
+)
 
 
 class ExtractRedshiftProxy(publish.Extractor):
@@ -18,6 +24,9 @@ class ExtractRedshiftProxy(publish.Extractor):
     def process(self, instance):
         """Extractor entry point."""
 
+        # Make sure Redshift is loaded
+        cmds.loadPlugin("redshift4maya", quiet=True)
+
         staging_dir = self.staging_dir(instance)
         file_name = "{}.rs".format(instance.name)
         file_path = os.path.join(staging_dir, file_name)
@@ -60,14 +69,22 @@ class ExtractRedshiftProxy(publish.Extractor):
 
         # Write out rs file
         self.log.debug("Writing: '%s'" % file_path)
+
+        # Allow overriding what renderlayer to export from. By default force
+        # it to the default render layer. (Note that the renderlayer isn't
+        # currently exposed as an attribute to artists)
+        layer = instance.data.get("renderLayer", "defaultRenderLayer")
+
         with maintained_selection():
-            cmds.select(instance.data["setMembers"], noExpand=True)
-            cmds.file(file_path,
-                      pr=False,
-                      force=True,
-                      type="Redshift Proxy",
-                      exportSelected=True,
-                      options=rs_options)
+            with renderlayer(layer):
+                with allow_export_from_render_setup_layer():
+                    cmds.select(instance.data["setMembers"], noExpand=True)
+                    cmds.file(file_path,
+                              preserveReferences=False,
+                              force=True,
+                              type="Redshift Proxy",
+                              exportSelected=True,
+                              options=rs_options)
 
         if "representations" not in instance.data:
             instance.data["representations"] = []