[Automated] Merged develop into main

This commit is contained in:
ynbot 2023-06-10 05:24:16 +02:00 committed by GitHub
commit b76367ae83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 9 deletions

View file

@ -35,6 +35,7 @@ body:
label: Version
description: What version are you running? Look to OpenPype Tray
options:
- 3.15.10
- 3.15.10-nightly.2
- 3.15.10-nightly.1
- 3.15.9
@ -134,7 +135,6 @@ body:
- 3.14.3-nightly.4
- 3.14.3-nightly.3
- 3.14.3-nightly.2
- 3.14.3-nightly.1
validations:
required: true
- type: dropdown

View file

@ -274,16 +274,18 @@ class ValidateRenderSettings(pyblish.api.InstancePlugin):
# go through definitions and test if such node.attribute exists.
# if so, compare its value from the one required.
for attribute, data in cls.get_nodes(instance, renderer).items():
for data in cls.get_nodes(instance, renderer):
for node in data["nodes"]:
try:
render_value = cmds.getAttr(
"{}.{}".format(node, attribute)
"{}.{}".format(node, data["attribute"])
)
except RuntimeError:
invalid = True
cls.log.error(
"Cannot get value of {}.{}".format(node, attribute)
"Cannot get value of {}.{}".format(
node, data["attribute"]
)
)
else:
if render_value not in data["values"]:
@ -291,7 +293,10 @@ class ValidateRenderSettings(pyblish.api.InstancePlugin):
cls.log.error(
"Invalid value {} set on {}.{}. Expecting "
"{}".format(
render_value, node, attribute, data["values"]
render_value,
node,
data["attribute"],
data["values"]
)
)
@ -305,7 +310,7 @@ class ValidateRenderSettings(pyblish.api.InstancePlugin):
"{}_render_attributes".format(renderer)
) or []
)
result = {}
result = []
for attr, values in OrderedDict(validation_settings).items():
values = [convert_to_int_or_float(v) for v in values if v]
@ -335,7 +340,13 @@ class ValidateRenderSettings(pyblish.api.InstancePlugin):
)
continue
result[attribute_name] = {"nodes": nodes, "values": values}
result.append(
{
"attribute": attribute_name,
"nodes": nodes,
"values": values
}
)
return result
@ -350,11 +361,11 @@ class ValidateRenderSettings(pyblish.api.InstancePlugin):
"{aov_separator}", instance.data.get("aovSeparator", "_")
)
for attribute, data in cls.get_nodes(instance, renderer).items():
for data in cls.get_nodes(instance, renderer):
if not data["values"]:
continue
for node in data["nodes"]:
lib.set_attribute(attribute, data["values"][0], node)
lib.set_attribute(data["attribute"], data["values"][0], node)
with lib.renderlayer(layer_node):
default = lib.RENDER_ATTRS['default']