Merge branch 'develop' into feature/OP-5207_Global-host-color-management-activation

This commit is contained in:
Jakub Ježek 2023-06-09 14:24:21 +02:00 committed by GitHub
commit caee9dcb13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 14 deletions

View file

@ -237,15 +237,25 @@ def _install_menu():
menu.addSeparator()
if not ASSIST:
# only add parent if nuke version is 14 or higher
# known issue with no solution yet
menu.addCommand(
"Create...",
lambda: host_tools.show_publisher(
parent=(
main_window if nuke.NUKE_VERSION_RELEASE >= 14 else None
),
tab="create"
)
)
# only add parent if nuke version is 14 or higher
# known issue with no solution yet
menu.addCommand(
"Publish...",
lambda: host_tools.show_publisher(
parent=(
main_window if nuke.NUKE_VERSION_RELEASE >= 14 else None
),
tab="publish"
)
)

View file

@ -23,7 +23,7 @@ class NukeRenderLocal(publish.Extractor,
order = pyblish.api.ExtractorOrder
label = "Render Local"
hosts = ["nuke"]
families = ["render.local", "prerender.local", "still.local"]
families = ["render.local", "prerender.local", "image.local"]
def process(self, instance):
child_nodes = (
@ -136,9 +136,9 @@ class NukeRenderLocal(publish.Extractor,
families.remove('prerender.local')
families.insert(0, "prerender")
instance.data["anatomyData"]["family"] = "prerender"
elif "still.local" in families:
elif "image.local" in families:
instance.data['family'] = 'image'
families.remove('still.local')
families.remove('image.local')
instance.data["anatomyData"]["family"] = "image"
instance.data["families"] = families

View file

@ -51,7 +51,7 @@ IMAGE_EXTENSIONS = {
".jng", ".jpeg", ".jpeg-ls", ".jpeg", ".2000", ".jpg", ".xr",
".jpeg", ".xt", ".jpeg-hdr", ".kra", ".mng", ".miff", ".nrrd",
".ora", ".pam", ".pbm", ".pgm", ".ppm", ".pnm", ".pcx", ".pgf",
".pictor", ".png", ".psb", ".psp", ".qtvr", ".ras",
".pictor", ".png", ".psd", ".psb", ".psp", ".qtvr", ".ras",
".rgbe", ".logluv", ".tiff", ".sgi", ".tga", ".tiff", ".tiff/ep",
".tiff/it", ".ufo", ".ufp", ".wbmp", ".webp", ".xbm", ".xcf",
".xpm", ".xwd"

View file

@ -144,7 +144,7 @@
},
{
"plugins": [
"CreateWriteStill"
"CreateWriteImage"
],
"nukeNodeClass": "Write",
"knobs": [
@ -559,15 +559,7 @@
"load": {
"LoadImage": {
"enabled": true,
"_representations": [
"exr",
"dpx",
"jpg",
"jpeg",
"png",
"psd",
"tiff"
],
"_representations": [],
"node_name_template": "{class_name}_{ext}"
},
"LoadClip": {