Merge branch 'develop' into enhancement/OP-6629_Maya-Export-Rig-Animation-as-FBX

openpype/hooks/pre_ocio_hook.py

@@ -13,7 +13,7 @@ class OCIOEnvHook(PreLaunchHook):
         "fusion",
         "blender",
         "aftereffects",
-        "max",
+        "3dsmax",
         "houdini",
         "maya",
         "nuke",

openpype/hosts/blender/plugins/load/load_blend.py

@@ -244,7 +244,7 @@ class BlendLoader(plugin.AssetLoader):
         for parent in parent_containers:
             parent.get(AVALON_PROPERTY)["members"] = list(filter(
                 lambda i: i not in members,
-                parent.get(AVALON_PROPERTY)["members"]))
+                parent.get(AVALON_PROPERTY).get("members", [])))
 
         for attr in attrs:
             for data in getattr(bpy.data, attr):

openpype/hosts/max/api/lib.py

@@ -1,15 +1,35 @@
 # -*- coding: utf-8 -*-
 """Library of functions useful for 3dsmax pipeline."""
 import contextlib
+import logging
 import json
 from typing import Any, Dict, Union
 
 import six
+from openpype.pipeline import get_current_project_name, colorspace
+from openpype.settings import get_project_settings
 from openpype.pipeline.context_tools import (
     get_current_project, get_current_project_asset)
+from openpype.style import load_stylesheet
 from pymxs import runtime as rt
 
+
 JSON_PREFIX = "JSON::"
+log = logging.getLogger("openpype.hosts.max")
+
+
+def get_main_window():
+    """Acquire Max's main window"""
+    from qtpy import QtWidgets
+    top_widgets = QtWidgets.QApplication.topLevelWidgets()
+    name = "QmaxApplicationWindow"
+    for widget in top_widgets:
+        if (
+            widget.inherits("QMainWindow")
+            and widget.metaObject().className() == name
+        ):
+            return widget
+    raise RuntimeError('Count not find 3dsMax main window.')
 
 
 def imprint(node_name: str, data: dict) -> bool:
@@ -277,6 +297,7 @@ def set_context_setting():
     """
     reset_scene_resolution()
     reset_frame_range()
+    reset_colorspace()
 
 
 def get_max_version():
@@ -292,6 +313,14 @@ def get_max_version():
     return max_info[7]
 
 
+def is_headless():
+    """Check if 3dsMax runs in batch mode.
+    If it returns True, it runs in 3dsbatch.exe
+    If it returns False, it runs in 3dsmax.exe
+    """
+    return rt.maxops.isInNonInteractiveMode()
+
+
 @contextlib.contextmanager
 def viewport_camera(camera):
     original = rt.viewport.getCamera()
@@ -314,6 +343,51 @@ def set_timeline(frameStart, frameEnd):
     return rt.animationRange
 
 
+def reset_colorspace():
+    """OCIO Configuration
+    Supports in 3dsMax 2024+
+
+    """
+    if int(get_max_version()) < 2024:
+        return
+    project_name = get_current_project_name()
+    colorspace_mgr = rt.ColorPipelineMgr
+    project_settings = get_project_settings(project_name)
+
+    max_config_data = colorspace.get_imageio_config(
+        project_name, "max", project_settings)
+    if max_config_data:
+        ocio_config_path = max_config_data["path"]
+        colorspace_mgr = rt.ColorPipelineMgr
+        colorspace_mgr.Mode = rt.Name("OCIO_Custom")
+        colorspace_mgr.OCIOConfigPath = ocio_config_path
+
+    colorspace_mgr.OCIOConfigPath = ocio_config_path
+
+
+def check_colorspace():
+    parent = get_main_window()
+    if parent is None:
+        log.info("Skipping outdated pop-up "
+                 "because Max main window can't be found.")
+    if int(get_max_version()) >= 2024:
+        color_mgr = rt.ColorPipelineMgr
+        project_name = get_current_project_name()
+        project_settings = get_project_settings(project_name)
+        max_config_data = colorspace.get_imageio_config(
+            project_name, "max", project_settings)
+        if max_config_data and color_mgr.Mode != rt.Name("OCIO_Custom"):
+            if not is_headless():
+                from openpype.widgets import popup
+                dialog = popup.Popup(parent=parent)
+                dialog.setWindowTitle("Warning: Wrong OCIO Mode")
+                dialog.setMessage("This scene has wrong OCIO "
+                                  "Mode setting.")
+                dialog.setButtonText("Fix")
+                dialog.setStyleSheet(load_stylesheet())
+                dialog.on_clicked.connect(reset_colorspace)
+                dialog.show()
+
 def unique_namespace(namespace, format="%02d",
                      prefix="", suffix="", con_suffix="CON"):
     """Return unique namespace

openpype/hosts/max/api/menu.py

@@ -119,6 +119,10 @@ class OpenPypeMenu(object):
         frame_action.triggered.connect(self.frame_range_callback)
         openpype_menu.addAction(frame_action)
 
+        colorspace_action = QtWidgets.QAction("Set Colorspace", openpype_menu)
+        colorspace_action.triggered.connect(self.colorspace_callback)
+        openpype_menu.addAction(colorspace_action)
+
         return openpype_menu
 
     def load_callback(self):
@@ -148,3 +152,7 @@ class OpenPypeMenu(object):
     def frame_range_callback(self):
         """Callback to reset frame range"""
         return lib.reset_frame_range()
+
+    def colorspace_callback(self):
+        """Callback to reset colorspace"""
+        return lib.reset_colorspace()

openpype/hosts/max/api/pipeline.py

@@ -57,6 +57,9 @@ class MaxHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost):
         rt.callbacks.addScript(rt.Name('systemPostNew'),
                                context_setting)
 
+        rt.callbacks.addScript(rt.Name('filePostOpen'),
+                               lib.check_colorspace)
+
     def has_unsaved_changes(self):
         # TODO: how to get it from 3dsmax?
         return True

openpype/hosts/max/plugins/publish/collect_render.py

@@ -34,6 +34,12 @@ class CollectRender(pyblish.api.InstancePlugin):
         files_by_aov.update(aovs)
 
         camera = rt.viewport.GetCamera()
+        if instance.data.get("members"):
+            camera_list = [member for member in instance.data["members"]
+                           if rt.ClassOf(member) == rt.Camera.Classes]
+            if camera_list:
+                camera = camera_list[-1]
+
         instance.data["cameras"] = [camera.name] if camera else None        # noqa
 
         if "expectedFiles" not in instance.data:
@@ -63,6 +69,17 @@ class CollectRender(pyblish.api.InstancePlugin):
         instance.data["colorspaceConfig"] = ""
         instance.data["colorspaceDisplay"] = "sRGB"
         instance.data["colorspaceView"] = "ACES 1.0 SDR-video"
+
+        if int(get_max_version()) >= 2024:
+            colorspace_mgr = rt.ColorPipelineMgr      # noqa
+            display = next(
+                (display for display in colorspace_mgr.GetDisplayList()))
+            view_transform = next(
+                (view for view in colorspace_mgr.GetViewList(display)))
+            instance.data["colorspaceConfig"] = colorspace_mgr.OCIOConfigPath
+            instance.data["colorspaceDisplay"] = display
+            instance.data["colorspaceView"] = view_transform
+
         instance.data["renderProducts"] = colorspace.ARenderProduct()
         instance.data["publishJobState"] = "Suspended"
         instance.data["attachTo"] = []

openpype/hosts/max/plugins/publish/collect_review.py

@@ -4,6 +4,7 @@ import pyblish.api
 
 from pymxs import runtime as rt
 from openpype.lib import BoolDef
+from openpype.hosts.max.api.lib import get_max_version
 from openpype.pipeline.publish import OpenPypePyblishPluginMixin
 
 
@@ -43,6 +44,17 @@ class CollectReview(pyblish.api.InstancePlugin,
             "dspSafeFrame": attr_values.get("dspSafeFrame"),
             "dspFrameNums": attr_values.get("dspFrameNums")
         }
+
+        if int(get_max_version()) >= 2024:
+            colorspace_mgr = rt.ColorPipelineMgr      # noqa
+            display = next(
+                (display for display in colorspace_mgr.GetDisplayList()))
+            view_transform = next(
+                (view for view in colorspace_mgr.GetViewList(display)))
+            instance.data["colorspaceConfig"] = colorspace_mgr.OCIOConfigPath
+            instance.data["colorspaceDisplay"] = display
+            instance.data["colorspaceView"] = view_transform
+
         # Enable ftrack functionality
         instance.data.setdefault("families", []).append('ftrack')
 
@@ -54,7 +66,6 @@ class CollectReview(pyblish.api.InstancePlugin,
 
     @classmethod
     def get_attribute_defs(cls):
-
         return [
             BoolDef("dspGeometry",
                     label="Geometry",

openpype/hosts/nuke/plugins/publish/collect_nuke_instance_data.py

@@ -2,7 +2,7 @@ import nuke
 import pyblish.api
 
 
-class CollectNukeInstanceData(pyblish.api.InstancePlugin):
+class CollectInstanceData(pyblish.api.InstancePlugin):
     """Collect Nuke instance data
 
     """

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

@@ -238,9 +238,10 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
             plugin_data["redshift_SeparateAovFiles"] = instance.data.get(
                 "separateAovFiles")
         if instance.data["cameras"]:
-            plugin_info["Camera0"] = None
-            plugin_info["Camera"] = instance.data["cameras"][0]
-            plugin_info["Camera1"] = instance.data["cameras"][0]
+            camera = instance.data["cameras"][0]
+            plugin_info["Camera0"] = camera
+            plugin_info["Camera"] = camera
+            plugin_info["Camera1"] = camera
         self.log.debug("plugin data:{}".format(plugin_data))
         plugin_info.update(plugin_data)