Working version for Arnold.

This commit is contained in:
Toke Stuart Jepsen 2023-01-31 18:35:50 +00:00
parent 28c793b38c
commit 3fa7610061
4 changed files with 27 additions and 10 deletions

View file

@ -14,7 +14,7 @@ from math import ceil
from six import string_types
from maya import cmds, mel
import maya.api.OpenMaya as om
from maya.api import OpenMaya
from openpype.client import (
get_project,
@ -3402,13 +3402,22 @@ def get_color_management_preferences():
)
}
# Split view and display from view_transform. view_transform comes in
# format of "{view} ({display})".
display = data["view_transform"].split("(")[-1].replace(")", "")
data.update({
"display": display,
"view": data["view_transform"].replace("({})".format(display), "")[:-1]
})
# Get config absolute path.
path = cmds.colorManagementPrefs(
query=True, configFilePath=True
)
# The OCIO config supports a custom <MAYA_RESOURCES> token.
maya_resources_token = "<MAYA_RESOURCES>"
maya_resources_path = om.MGlobal.getAbsolutePathToResources()
maya_resources_path = OpenMaya.MGlobal.getAbsolutePathToResources()
path = path.replace(maya_resources_token, maya_resources_path)
data["config"] = path

View file

@ -648,8 +648,12 @@ class RenderProductsArnold(ARenderProducts):
preferences = lib.get_color_management_preferences()
return preferences["view_transform"]
def _raw():
preferences = lib.get_color_management_preferences()
return preferences["rendering_space"]
resolved_values = {
"Raw": lambda: "Raw",
"Raw": _raw,
"Use View Transform": _view_transform,
# Default. Same as Maya Preferences.
"Use Output Transform": lib.get_color_management_output_transform

View file

@ -264,7 +264,7 @@ class CollectMayaRender(pyblish.api.ContextPlugin):
self.log.info(full_exp_files)
self.log.info("collecting layer: {}".format(layer_name))
# Get layer specific settings, might be overrides
colorspace_data = lib.get_color_management_preferences()
data = {
"subset": expected_layer_name,
"attachTo": attach_to,
@ -318,9 +318,9 @@ class CollectMayaRender(pyblish.api.ContextPlugin):
"renderSetupIncludeLights": render_instance.data.get(
"renderSetupIncludeLights"
),
"colorspaceConfig": (
lib.get_color_management_preferences()["config"]
)
"colorspaceConfig": colorspace_data["config"],
"colorspaceDisplay": colorspace_data["display"],
"colorspaceView": colorspace_data["view"]
}
# Collect Deadline url if Deadline module is enabled

View file

@ -550,10 +550,12 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
"tags": ["review"] if preview else [],
"colorspaceData": {
"colorspace": colorspace,
"configData": {
"config": {
"path": additional_data["colorspaceConfig"],
"template": ""
}
},
"display": additional_data["display"],
"view": additional_data["view"]
}
}
@ -916,7 +918,9 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
additional_data = {
"renderProducts": instance.data["renderProducts"],
"colorspaceConfig": instance.data["colorspaceConfig"]
"colorspaceConfig": instance.data["colorspaceConfig"],
"display": instance.data["colorspaceDisplay"],
"view": instance.data["colorspaceView"]
}
if isinstance(data.get("expectedFiles")[0], dict):