diff --git a/pype/hosts/nuke/api/__init__.py b/pype/hosts/nuke/api/__init__.py index b60f79d910..c303c17b39 100644 --- a/pype/hosts/nuke/api/__init__.py +++ b/pype/hosts/nuke/api/__init__.py @@ -116,7 +116,6 @@ def uninstall(): pyblish.deregister_callback("instanceToggled", on_pyblish_instance_toggled) - reload_config() menu.uninstall() diff --git a/pype/hosts/nuke/api/lib.py b/pype/hosts/nuke/api/lib.py index 1f3c34fe31..e9dcb827fb 100644 --- a/pype/hosts/nuke/api/lib.py +++ b/pype/hosts/nuke/api/lib.py @@ -17,7 +17,7 @@ from pype.api import ( config, ApplicationManager ) - + import nuke from .utils import set_context_favorites @@ -41,11 +41,11 @@ def get_node_imageio_setting(**kwarg): "`{}`: Missing mandatory kwargs `host`, `cls`".format(__file__)) imageio_nodes = (get_anatomy_settings(project_name) - ["imageio"] - .get(host, None) - ["nodes"] - ["requiredNodes"] - ) + ["imageio"] + .get(host, None) + ["nodes"] + ["requiredNodes"] + ) for node in imageio_nodes: log.info(node) @@ -61,11 +61,11 @@ def get_imageio_input_colorspace(filename): ''' Get input file colorspace based on regex in settings. ''' imageio_regex_inputs = (get_anatomy_settings(os.getenv("AVALON_PROJECT")) - ["imageio"] - ["nuke"] - ["regexInputs"] - ["inputs"] - ) + ["imageio"] + ["nuke"] + ["regexInputs"] + ["inputs"] + ) preset_clrsp = None for regexInput in imageio_regex_inputs: @@ -253,7 +253,7 @@ def format_anatomy(data): log.error(msg) nuke.message(msg) - + version = data.get("version", None) if not version: file = script_name() @@ -363,7 +363,6 @@ def create_write_node(name, data, input=None, prenodes=None, review=True): if knob["name"] not in ["_id", "_previous"]: _data.update({knob["name"]: knob["value"]}) - _data = avalon.nuke.lib.fix_data_for_node_create(_data) log.debug("_data: `{}`".format(_data)) @@ -838,7 +837,8 @@ class WorkfileSettings(object): def set_colorspace(self): ''' Setting colorpace following presets ''' - nuke_colorspace = config.get_init_presets()["colorspace"].get("nuke", None) + nuke_colorspace = config.get_init_presets( + )["colorspace"].get("nuke", None) try: self.set_root_colorspace(nuke_colorspace["root"]) @@ -903,7 +903,7 @@ class WorkfileSettings(object): handle_start = data["handleStart"] handle_end = data["handleEnd"] - fps = data["fps"] + fps = float(data["fps"]) frame_start = int(data["frameStart"]) - handle_start frame_end = int(data["frameEnd"]) + handle_end @@ -1119,7 +1119,6 @@ def get_write_node_template_attr(node): for k, v in nuke_imageio_writes.items() if k not in ["_id", "_previous"]} - # fix badly encoded data return avalon.nuke.lib.fix_data_for_node_create(correct_data) @@ -1240,6 +1239,7 @@ class ExporterReviewLut(ExporterReview): """ + def __init__(self, klass, instance, @@ -1342,6 +1342,7 @@ class ExporterReviewMov(ExporterReview): instance (pyblish.instance): instance of pyblish context """ + def __init__(self, klass, instance, diff --git a/pype/hosts/nuke/plugins/create/create_write_render.py b/pype/hosts/nuke/plugins/create/create_write_render.py index 3876ba5806..60db8800dd 100644 --- a/pype/hosts/nuke/plugins/create/create_write_render.py +++ b/pype/hosts/nuke/plugins/create/create_write_render.py @@ -48,6 +48,7 @@ class CreateWriteRender(plugin.PypeCreator): "or tick off `Use selection`") self.log.error(msg) nuke.message(msg) + return if len(nodes) == 0: msg = ( @@ -56,6 +57,7 @@ class CreateWriteRender(plugin.PypeCreator): ) self.log.error(msg) nuke.message(msg) + return selected_node = nodes[0] inputs = [selected_node] diff --git a/pype/hosts/nuke/startup/menu.py b/pype/hosts/nuke/startup/menu.py index eb3b88c6cc..be0f6c411c 100644 --- a/pype/hosts/nuke/startup/menu.py +++ b/pype/hosts/nuke/startup/menu.py @@ -1,8 +1,4 @@ -import os -import sys - from pype.hosts.nuke.api.lib import ( - writes_version_sync, on_script_load, check_inventory_versions ) @@ -13,10 +9,8 @@ from pype.api import Logger log = Logger().get_logger(__name__, "nuke") -# nuke.addOnScriptSave(writes_version_sync) nuke.addOnScriptSave(on_script_load) nuke.addOnScriptLoad(check_inventory_versions) nuke.addOnScriptSave(check_inventory_versions) -# nuke.addOnScriptSave(lib.writes_version_sync) log.info('Automatic syncing of write file knob to script version') diff --git a/pype/settings/defaults/system_settings/applications.json b/pype/settings/defaults/system_settings/applications.json index f0e68aefd2..24bed66783 100644 --- a/pype/settings/defaults/system_settings/applications.json +++ b/pype/settings/defaults/system_settings/applications.json @@ -237,7 +237,8 @@ "__environment_keys__": { "nuke": [ "NUKE_PATH", - "PATH" + "PATH", + "LOGLEVEL" ] }, "NUKE_PATH": [ @@ -247,7 +248,8 @@ ], "PATH": { "windows": "C:/Program Files (x86)/QuickTime/QTSystem/;{PATH}" - } + }, + "LOGLEVEL": "INFO" }, "variants": { "nuke_12.2": { @@ -788,9 +790,7 @@ "RESOLVE_DEV" ] }, - "RESOLVE_UTILITY_SCRIPTS_SOURCE_DIR": [ - "{STUDIO_SOFT}/davinci_resolve/scripts/python" - ], + "RESOLVE_UTILITY_SCRIPTS_SOURCE_DIR": [], "RESOLVE_SCRIPT_API": { "windows": "{PROGRAMDATA}/Blackmagic Design/DaVinci Resolve/Support/Developer/Scripting", "darvin": "/Library/Application Support/Blackmagic Design/DaVinci Resolve/Developer/Scripting", @@ -834,7 +834,12 @@ "variant_label": "16", "icon": "", "executables": { - "windows": [], + "windows": [ + [ + "C:/Program Files/Blackmagic Design/DaVinci Resolve/Resolve.exe", + "" + ] + ], "darwin": [], "linux": [] }, diff --git a/pype/settings/defaults/system_settings/general.json b/pype/settings/defaults/system_settings/general.json index bae0ed4e87..31ee818715 100644 --- a/pype/settings/defaults/system_settings/general.json +++ b/pype/settings/defaults/system_settings/general.json @@ -25,7 +25,7 @@ ] }, "FFMPEG_PATH": { - "windows": "{VIRTUAL_ENV}/localized/ffmpeg_exec/windows/bin;{PYPE_SETUP_PATH}/vendor/bin/ffmpeg_exec/windows/bin", + "windows": "C:/CODE/__PYPE/pype3/vendor/bin/ffmpeg_exec/windows/bin", "darwin": "{VIRTUAL_ENV}/localized/ffmpeg_exec/darwin/bin:{PYPE_SETUP_PATH}/vendor/bin/ffmpeg_exec/darwin/bin", "linux": "{VIRTUAL_ENV}/localized/ffmpeg_exec/linux:{PYPE_SETUP_PATH}/vendor/bin/ffmpeg_exec/linux" },