Merge branch 'develop' into bugfix/collect-inputs-collect-invalid-renderlayer-objects

client/ayon_core/hosts/max/api/preview_animation.py

@@ -31,23 +31,26 @@ def viewport_layout_and_camera(camera, layout="layout_1"):
         layout (str): layout to use in viewport, defaults to `layout_1`
             Use None to not change viewport layout during context.
     """
+    needs_maximise = 0
+    # Set to first active non extended viewport
+    rt.viewport.activeViewportEx(1)
     original_camera = rt.viewport.getCamera()
-    original_layout = rt.viewport.getLayout()
-    if not original_camera:
-        # if there is no original camera
-        # use the current camera as original
-        original_camera = rt.getNodeByName(camera)
+    original_type = rt.viewport.getType()
     review_camera = rt.getNodeByName(camera)
+
     try:
-        if layout is not None:
-            layout = rt.Name(layout)
-            if rt.viewport.getLayout() != layout:
-                rt.viewport.setLayout(layout)
+        if rt.viewport.getLayout() != rt.name(layout):
+            rt.execute("max tool maximize")
+            needs_maximise = 1
         rt.viewport.setCamera(review_camera)
         yield
     finally:
-        rt.viewport.setLayout(original_layout)
-        rt.viewport.setCamera(original_camera)
+        if needs_maximise == 1:
+            rt.execute("max tool maximize")
+        if original_type == rt.Name("view_camera"):
+            rt.viewport.setCamera(original_camera)
+        else:
+            rt.viewport.setType(original_type)
 
 
 @contextlib.contextmanager

client/ayon_core/hosts/max/plugins/publish/validate_extended_viewport.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+import pyblish.api
+from ayon_core.pipeline import PublishValidationError
+from pymxs import runtime as rt
+
+
+class ValidateExtendedViewport(pyblish.api.ContextPlugin):
+    """Validate if the first viewport is an extended viewport."""
+
+    order = pyblish.api.ValidatorOrder
+    families = ["review"]
+    hosts = ["max"]
+    label = "Validate Extended Viewport"
+
+    def process(self, context):
+        try:
+            rt.viewport.activeViewportEx(1)
+        except RuntimeError:
+            raise PublishValidationError(
+                "Please make sure one viewport is not an extended viewport",
+                description = (
+                        "Please make sure at least one viewport is not an "
+                        "extended viewport but a 3dsmax supported viewport "
+                        "i.e camera/persp/orthographic view.\n\n"
+                        "To rectify it, please go to view in the top menubar, "
+                        "go to Views -> Viewports Configuration -> Layout and "
+                        "right click on one of the panels to change it."
+                ))
+

server_addon/maya/server/settings/render_settings.py

@@ -355,7 +355,7 @@ class RedshiftSettingsModel(BaseSettingsModel):
     )
     additional_options: list[AdditionalOptionsModel] = SettingsField(
         default_factory=list,
-        title="Additional Vray Options",
+        title="Additional Redshift Options",
         description=(
             "Add additional options - put attribute and value, like "
             "reflectionMaxTraceDepth and 3"