Merge branch 'enhancement/OP-7661_houdini-split-render-job-redshift' of github.com:ynput/OpenPype into enhancement/OP-7661_houdini-split-render-job-redshift

openpype/hosts/houdini/plugins/create/create_redshift_rop.py

@@ -15,6 +15,9 @@ class CreateRedshiftROP(plugin.HoudiniCreator):
     icon = "magic"
     ext = "exr"
 
+    # Default to split export and render jobs
+    split_render = True
+
     def create(self, subset_name, instance_data, pre_create_data):
 
         instance_data.pop("active", None)
@@ -76,6 +79,18 @@ class CreateRedshiftROP(plugin.HoudiniCreator):
                     camera = node.path()
             parms.update({
                 "RS_renderCamera": camera or ""})
+
+        rs_filepath = \
+            "{export_dir}{subset_name}/{subset_name}.$F4.rs".format(
+                export_dir=hou.text.expandString("$HIP/pyblish/rs/"),
+                subset_name=subset_name,
+            )
+        parms["RS_archive_file"] = rs_filepath
+
+        if pre_create_data.get("split_render", self.split_render):
+            parms["RS_archive_enable"] = 1
+
+
         instance_node.setParms(parms)
 
         # Lock some Avalon attributes
@@ -102,6 +117,9 @@ class CreateRedshiftROP(plugin.HoudiniCreator):
             BoolDef("farm",
                     label="Submitting to Farm",
                     default=True),
+            BoolDef("split_render",
+                    label="Split export and render jobs",
+                    default=self.split_render),
             EnumDef("image_format",
                     image_format_enum,
                     default=self.ext,

openpype/hosts/houdini/plugins/publish/collect_redshift_rop.py

@@ -48,7 +48,6 @@ class CollectRedshiftROPRenderProducts(pyblish.api.InstancePlugin):
         # Store whether we are splitting the render job (export + render)
         split_render = bool(rop.parm("RS_archive_enable").eval())
         instance.data["splitRender"] = split_render
-        export_prefix = None
         export_products = []
         if split_render:
             export_prefix = evalParmNoFrame(

openpype/modules/deadline/plugins/publish/submit_houdini_render_deadline.py

@@ -46,6 +46,7 @@ class RedshiftRenderPluginInfo():
     SceneFile = attr.ib(default=None)
     Version = attr.ib(default=None)
 
+
 class HoudiniSubmitDeadline(
     abstract_submit_deadline.AbstractSubmitDeadline,
     OpenPypePyblishPluginMixin