Merge branch 'develop' into enhancement/OP-6451_Nuke---ExctractReviewDataMov-plugin-with-multiple-format-support

This commit is contained in:
Kayla Man 2023-09-25 22:00:44 +08:00
commit 0c62e195dd
2 changed files with 42 additions and 13 deletions

View file

@ -2316,27 +2316,53 @@ Reopening Nuke should synchronize these paths and resolve any discrepancies.
''' Adds correct colorspace to write node dict
'''
for node in nuke.allNodes(filter="Group"):
for node in nuke.allNodes(filter="Group", group=self._root_node):
log.info("Setting colorspace to `{}`".format(node.name()))
# get data from avalon knob
avalon_knob_data = read_avalon_data(node)
node_data = get_node_data(node, INSTANCE_DATA_KNOB)
if avalon_knob_data.get("id") != "pyblish.avalon.instance":
if (
# backward compatibility
# TODO: remove this once old avalon data api will be removed
avalon_knob_data
and avalon_knob_data.get("id") != "pyblish.avalon.instance"
):
continue
elif (
node_data
and node_data.get("id") != "pyblish.avalon.instance"
):
continue
if "creator" not in avalon_knob_data:
if (
# backward compatibility
# TODO: remove this once old avalon data api will be removed
avalon_knob_data
and "creator" not in avalon_knob_data
):
continue
elif (
node_data
and "creator_identifier" not in node_data
):
continue
# establish families
families = [avalon_knob_data["family"]]
if avalon_knob_data.get("families"):
families.append(avalon_knob_data.get("families"))
nuke_imageio_writes = None
if avalon_knob_data:
# establish families
families = [avalon_knob_data["family"]]
if avalon_knob_data.get("families"):
families.append(avalon_knob_data.get("families"))
nuke_imageio_writes = get_imageio_node_setting(
node_class=avalon_knob_data["families"],
plugin_name=avalon_knob_data["creator"],
subset=avalon_knob_data["subset"]
)
nuke_imageio_writes = get_imageio_node_setting(
node_class=avalon_knob_data["families"],
plugin_name=avalon_knob_data["creator"],
subset=avalon_knob_data["subset"]
)
elif node_data:
nuke_imageio_writes = get_write_node_template_attr(node)
log.debug("nuke_imageio_writes: `{}`".format(nuke_imageio_writes))

View file

@ -27,6 +27,9 @@ class CachedData:
has_compatible_ocio_package = None
config_version_data = {}
ocio_config_colorspaces = {}
allowed_exts = {
ext.lstrip(".") for ext in IMAGE_EXTENSIONS.union(VIDEO_EXTENSIONS)
}
class DeprecatedWarning(DeprecationWarning):
@ -361,7 +364,7 @@ def parse_colorspace_from_filepath(
# match colorspace from filepath
regex_pattern = _get_colorspace_match_regex(
colorspaces + underscored_colorspaces.keys())
list(colorspaces) + list(underscored_colorspaces))
match = regex_pattern.search(filepath)
colorspace = match.group(0) if match else None