Vray: Implement save file for non-exr format and non-raw exr

client/ayon_max/api/lib.py

@@ -1123,6 +1123,28 @@ def set_correct_workfile_name_for_render_output(
         return filepath
 
     rest = match.group("rest") or ""
+
+    # update the changes in the context instances to reflect the new workfile name
+    host = registered_host()
+    create_context = CreateContext(host, discover_publish_plugins=False)
+    workfile_name_keys = {
+        "original_workfile_pattern",
+        # backward compatibility for older versions of Ayon
+        "AssetName"
+    }
+
+    has_changes = False
+    for created_instance in create_context.instances:
+        for key in workfile_name_keys:
+            if key not in created_instance:
+                continue
+            if created_instance[key] != render_workfile_name:
+                continue
+            created_instance[key] = current_workfile_filename
+            has_changes = True
+
+    if has_changes:
+        create_context.save_changes()
     return os.path.join(
         render_root,
         current_workfile_filename,
@@ -1153,3 +1175,22 @@ def build_general_output_filename(
         ext = match.group("ext")
         filename = f"{name}_{element}..{ext}"
     return os.path.join(output_dir, filename)
+
+
+def is_vray_exr_saverawfile(image_format: str, vr_settings: Any) -> bool:
+    """Check if V-Ray renderer is set to output raw files in EXR format.
+
+    Args:
+        image_format (str): The image format being used for rendering.
+        vr_settings (Any): The V-Ray settings object
+
+    Returns:
+        bool: True if the image format is EXR and V-Ray is set to save
+            raw files, False otherwise.
+    """
+    return (
+        image_format == "exr"
+        # safe check
+        and hasattr(vr_settings, "output_saverawfile")
+        and vr_settings.output_saverawfile
+    )

client/ayon_max/api/lib_renderproducts.py

@@ -17,6 +17,7 @@
     get_current_renderer,
     get_multipass_setting,
     reformat_filename,
+    is_vray_exr_saverawfile,
 )
 from ayon_core.pipeline import get_current_project_name
 from ayon_core.settings import get_project_settings
@@ -218,19 +219,24 @@ def get_vray_render_output(
             if "GPU" in str(vr_renderer)
             else vr_renderer
         )
-        if (
-            not is_render_element
-            and image_format == "exr"
-            and not vray_settings.output_rawfilename
-        ):
-            return getattr(vray_settings, "output_splitfilename", "") or rt.rendOutputFilename
+        is_save_vray_exr_rawfile = is_vray_exr_saverawfile(
+            image_format,
+            vray_settings,
+        )
+        if not is_save_vray_exr_rawfile and not is_render_element:
+            # In non-raw mode V-Ray writes the beauty output to `rt.rendOutputFilename`.
+            return rt.rendOutputFilename or getattr(vray_settings, "output_splitfilename", "")
         output_attr = (
             "output_rawfilename"
-            if not is_render_element and image_format == "exr"
+            if not is_render_element
+            and is_save_vray_exr_rawfile
             else "output_splitfilename"
         )
-        render_output = getattr(vray_settings, output_attr)
-        return render_output if render_output else rt.rendOutputFilename
+        render_output = getattr(vray_settings, output_attr, "")
+        if not render_output:
+            return rt.rendOutputFilename
+
+        return render_output
 
     def get_arnold_render_output(self, arnold_renderer: Any, extension: str) -> str:
         """Get the Arnold render output filename.

client/ayon_max/api/lib_rendersettings.py

@@ -19,6 +19,7 @@
     get_default_render_folder,
     get_multipass_setting,
     get_vray_settings,
+    is_vray_exr_saverawfile,
 )
 
 
@@ -140,12 +141,17 @@ def render_output(self):
             if img_fmt == "exr":
                 vr_settings.output_saverawfile = True
                 vr_settings.output_rawfilename = f"{output}.{img_fmt}"
+            else:
+                if hasattr(vr_settings, "output_saverawfile"):
+                    vr_settings.output_saverawfile = False
+                if hasattr(vr_settings, "output_rawfilename"):
+                    vr_settings.output_rawfilename = ""
+                rt.rendOutputFilename = f"{output}..{img_fmt}"
 
             if multipass_enabled:
                 rt.rendOutputFilename = output_filename
                 vr_settings.output_splitfilename = f"{output}.{img_fmt}"
-            else:
-                rt.rendOutputFilename = f"{output}_tmp..{img_fmt}"
+
             self.render_element_layer(output, width, height, img_fmt)
         # TODO: supports multipass for different renderers
         elif renderer_name == "Redshift_Renderer":
@@ -155,8 +161,10 @@ def render_output(self):
                 rt.renderers.production.OutputExrMultipart = multipass_enabled
 
         # prevent rendering extra files when using V-Ray
-        rt.rendSaveFile = True if not renderer_name.startswith("V_Ray_") else False
-
+        rt.rendSaveFile = not (
+            renderer_name.startswith("V_Ray_")
+            and is_vray_exr_saverawfile(img_fmt, vr_settings)
+        )
         rt.renderSceneDialog.update()
 
     def arnold_setup(self, output_dir, container, multipass_enabled):