diff --git a/pype/__init__.py b/pype/__init__.py index e5d1aee374..7f854b2073 100644 --- a/pype/__init__.py +++ b/pype/__init__.py @@ -24,3 +24,4 @@ def uninstall(): print("Deregistering global plug-ins..") pyblish.deregister_plugin_path(PUBLISH_PATH) avalon.deregister_plugin_path(avalon.Loader, LOAD_PATH) + print("Global plug-ins unregistred") diff --git a/pype/plugins/nuke/create/create_write_exr.py b/pype/plugins/nuke/create/create_write_exr.py index 41cd528b15..b77b5735e8 100644 --- a/pype/plugins/nuke/create/create_write_exr.py +++ b/pype/plugins/nuke/create/create_write_exr.py @@ -10,7 +10,9 @@ class CrateWriteExr(avalon.api.Creator): hosts = ["nuke"] family = "write" icon = "sign-out" - + # TODO: create container of metadata into user knob + # TODO: if write node selected it will add metadata + # def __init__(self, *args, **kwargs): # super(CrateWriteExr, self).__init__(*args, **kwargs) # self.data.setdefault("subset", "this") diff --git a/pype/plugins/nuke/publish/collect_current_file.py b/pype/plugins/nuke/publish/collect_current_file.py index 0d4867f08b..96ec44d9d6 100644 --- a/pype/plugins/nuke/publish/collect_current_file.py +++ b/pype/plugins/nuke/publish/collect_current_file.py @@ -1,18 +1,18 @@ import pyblish.api -class CollectCurrentFile(pyblish.api.ContextPlugin): +class SelectCurrentFile(pyblish.api.ContextPlugin): """Inject the current working file into context""" - order = pyblish.api.CollectorOrder - 0.1 - label = "Collect Current File" + order = pyblish.api.CollectorOrder hosts = ["nuke"] - families = ["workfile"] def process(self, context): import os import nuke current_file = nuke.root().name() + normalised = os.path.normpath(current_file) + context.data["current_file"] = normalised context.data["currentFile"] = normalised diff --git a/pype/plugins/nuke/publish/collect_nuke_writes.py b/pype/plugins/nuke/publish/collect_nuke_writes.py index 05def54582..2774c2ed54 100644 --- a/pype/plugins/nuke/publish/collect_nuke_writes.py +++ b/pype/plugins/nuke/publish/collect_nuke_writes.py @@ -63,8 +63,6 @@ class CollectNukeWrites(pyblish.api.ContextPlugin): knob.setValue(False) node.addKnob(knob) - value = bool(node["render_local"].getValue()) - # Compare against selection selection = instance.context.data.get("selection", []) if selection: @@ -73,11 +71,8 @@ class CollectNukeWrites(pyblish.api.ContextPlugin): else: value = False - def instanceToggled(instance, value): - instance[0]["render_local"].setValue(value) instance.data.update({ - "instanceToggled": instanceToggled, "asset": os.environ["AVALON_ASSET"], # todo: not a constant "path": nuke.filename(node), "subset": subset, diff --git a/pype/plugins/nuke/publish/collect_render_target.py b/pype/plugins/nuke/publish/collect_render_target.py index c8059613a9..86a38f26b6 100644 --- a/pype/plugins/nuke/publish/collect_render_target.py +++ b/pype/plugins/nuke/publish/collect_render_target.py @@ -24,7 +24,7 @@ class CollectNukeRenderMode(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder + 0.4 label = "Collect Render Mode" hosts = ["nuke"] - families = ["write", "render"] + families = ["write", "render.local"] def process(self, instance): """Collect all image sequence tools""" diff --git a/pype/plugins/nuke/publish/extract_script_save.py b/pype/plugins/nuke/publish/script_save.py similarity index 91% rename from pype/plugins/nuke/publish/extract_script_save.py rename to pype/plugins/nuke/publish/script_save.py index 76054f72c1..472742f464 100644 --- a/pype/plugins/nuke/publish/extract_script_save.py +++ b/pype/plugins/nuke/publish/script_save.py @@ -8,7 +8,6 @@ class ExtractScriptSave(pyblish.api.Extractor): label = 'Script Save' order = pyblish.api.Extractor.order - 0.45 hosts = ['nuke'] - families = ['script'] def process(self, instance):