From 18e1f62ba29ff796e35b6e8da6bba3ce1f113e29 Mon Sep 17 00:00:00 2001
From: MustafaJafar <mustafataherzaky@outlook.com>
Date: Mon, 8 Jan 2024 11:27:43 +0200
Subject: [PATCH 1/3] add split setting in redshift rop creator

---
 .../plugins/create/create_redshift_rop.py        | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/openpype/hosts/houdini/plugins/create/create_redshift_rop.py b/openpype/hosts/houdini/plugins/create/create_redshift_rop.py
index 1b8826a932..d790aaa340 100644
--- a/openpype/hosts/houdini/plugins/create/create_redshift_rop.py
+++ b/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,16 @@ class CreateRedshiftROP(plugin.HoudiniCreator):
                     camera = node.path()
             parms.update({
                 "RS_renderCamera": camera or ""})
+
+        if pre_create_data.get("split_render"):
+            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_enable"] = 1
+            parms["RS_archive_file"] = rs_filepath
+
         instance_node.setParms(parms)
 
         # Lock some Avalon attributes
@@ -102,6 +115,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,

From 808a2b7031d0ec81516ee170fd3bcef1fa5e3b1c Mon Sep 17 00:00:00 2001
From: MustafaJafar <mustafataherzaky@outlook.com>
Date: Mon, 8 Jan 2024 11:43:04 +0200
Subject: [PATCH 2/3] BigRoy's comments

---
 .../plugins/create/create_redshift_rop.py        | 16 +++++++++-------
 .../plugins/publish/collect_redshift_rop.py      |  1 -
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/openpype/hosts/houdini/plugins/create/create_redshift_rop.py b/openpype/hosts/houdini/plugins/create/create_redshift_rop.py
index d790aaa340..097c703283 100644
--- a/openpype/hosts/houdini/plugins/create/create_redshift_rop.py
+++ b/openpype/hosts/houdini/plugins/create/create_redshift_rop.py
@@ -80,14 +80,16 @@ class CreateRedshiftROP(plugin.HoudiniCreator):
             parms.update({
                 "RS_renderCamera": camera or ""})
 
-        if pre_create_data.get("split_render"):
-            rs_filepath = \
-                "{export_dir}{subset_name}/{subset_name}.$F4.rs".format(
-                    export_dir=hou.text.expandString("$HIP/pyblish/rs/"),
-                    subset_name=subset_name,
-                )
+        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
-            parms["RS_archive_file"] = rs_filepath
+
 
         instance_node.setParms(parms)
 
diff --git a/openpype/hosts/houdini/plugins/publish/collect_redshift_rop.py b/openpype/hosts/houdini/plugins/publish/collect_redshift_rop.py
index cd3bb2bb7a..056684b3a3 100644
--- a/openpype/hosts/houdini/plugins/publish/collect_redshift_rop.py
+++ b/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(

From 938d9126a2bf76df4f9a3e5ccde2231dfd6507c3 Mon Sep 17 00:00:00 2001
From: MustafaJafar <mustafataherzaky@outlook.com>
Date: Mon, 8 Jan 2024 11:48:23 +0200
Subject: [PATCH 3/3] BigRoy's comment - stick to code style

---
 .../deadline/plugins/publish/submit_houdini_render_deadline.py   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openpype/modules/deadline/plugins/publish/submit_houdini_render_deadline.py b/openpype/modules/deadline/plugins/publish/submit_houdini_render_deadline.py
index 0bfb37ee1c..8b03f682fc 100644
--- a/openpype/modules/deadline/plugins/publish/submit_houdini_render_deadline.py
+++ b/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