diff --git a/pype/nukestudio/__init__.py b/pype/nukestudio/__init__.py index f3ef69608f..7a87009141 100644 --- a/pype/nukestudio/__init__.py +++ b/pype/nukestudio/__init__.py @@ -32,8 +32,6 @@ LOAD_PATH = os.path.join(PLUGINS_DIR, "nukestudio", "load") CREATE_PATH = os.path.join(PLUGINS_DIR, "nukestudio", "create") INVENTORY_PATH = os.path.join(PLUGINS_DIR, "nukestudio", "inventory") -self = sys.modules[__name__] -self.nLogger = None if os.getenv("PYBLISH_GUI", None): pyblish.register_gui(os.getenv("PYBLISH_GUI", None)) @@ -49,14 +47,12 @@ def reload_config(): import importlib for module in ( - "app", - "app.api", + "pypeapp", "{}.api".format(AVALON_CONFIG), "{}.templates".format(AVALON_CONFIG), - "{}.nuke.actions".format(AVALON_CONFIG), - "{}.nuke.templates".format(AVALON_CONFIG), - "{}.nuke.menu".format(AVALON_CONFIG), - "{}.nuke.lib".format(AVALON_CONFIG), + "{}.nukestudio.inventory".format(AVALON_CONFIG), + "{}.nukestudio.lib".format(AVALON_CONFIG), + "{}.nukestudio.menu".format(AVALON_CONFIG), ): log.info("Reloading module: {}...".format(module)) try: @@ -74,9 +70,9 @@ def install(): import sys - for path in sys.path: - if path.startswith("C:\\Users\\Public"): - sys.path.remove(path) + # for path in sys.path: + # if path.startswith("C:\\Users\\Public"): + # sys.path.remove(path) log.info("Registering Nuke plug-ins..") pyblish.register_plugin_path(PUBLISH_PATH) @@ -84,8 +80,6 @@ def install(): avalon.register_plugin_path(avalon.Creator, CREATE_PATH) avalon.register_plugin_path(avalon.InventoryAction, INVENTORY_PATH) - pyblish.register_callback("instanceToggled", on_pyblish_instance_toggled) - # Disable all families except for the ones we explicitly want to see family_states = [ "write", @@ -98,7 +92,7 @@ def install(): menu.install() # load data from templates - # api.load_data_from_templates() + api.load_data_from_templates() def uninstall(): @@ -107,30 +101,5 @@ def uninstall(): avalon.deregister_plugin_path(avalon.Loader, LOAD_PATH) avalon.deregister_plugin_path(avalon.Creator, CREATE_PATH) - pyblish.deregister_callback("instanceToggled", on_pyblish_instance_toggled) - # reset data from templates api.reset_data_from_templates() - - -def on_pyblish_instance_toggled(instance, old_value, new_value): - """Toggle node passthrough states on instance toggles.""" - self.log.info("instance toggle: {}, old_value: {}, new_value:{} ".format( - instance, old_value, new_value)) - - from avalon.nuke import ( - viewer_update_and_undo_stop, - add_publish_knob - ) - - # Whether instances should be passthrough based on new value - - with viewer_update_and_undo_stop(): - n = instance[0] - try: - n["publish"].value() - except ValueError: - n = add_publish_knob(n) - log.info(" `Publish` knob was added to write node..") - - n["publish"].setValue(new_value) diff --git a/setup/nukestudio/hiero_plugin_path/Python/Startup/pyblish_startup.py b/setup/nukestudio/hiero_plugin_path/Python/Startup/Startup.py similarity index 72% rename from setup/nukestudio/hiero_plugin_path/Python/Startup/pyblish_startup.py rename to setup/nukestudio/hiero_plugin_path/Python/Startup/Startup.py index 4459be6713..bbef6502a9 100644 --- a/setup/nukestudio/hiero_plugin_path/Python/Startup/pyblish_startup.py +++ b/setup/nukestudio/hiero_plugin_path/Python/Startup/Startup.py @@ -1,5 +1,10 @@ import traceback +# activate nukestudio from pype +import avalon.api +import pype.nukestudio +avalon.api.install(pype.nukestudio) + try: __import__("pype.nukestudio") __import__("pyblish") diff --git a/setup/nukestudio/hiero_plugin_path/Startup_old/pyblish_startup.py b/setup/nukestudio/hiero_plugin_path/Startup_old/pyblish_startup.py deleted file mode 100644 index 4459be6713..0000000000 --- a/setup/nukestudio/hiero_plugin_path/Startup_old/pyblish_startup.py +++ /dev/null @@ -1,14 +0,0 @@ -import traceback - -try: - __import__("pype.nukestudio") - __import__("pyblish") - -except ImportError as e: - print traceback.format_exc() - print("pyblish: Could not load integration: %s " % e) - -else: - # Setup integration - import pype.nukestudio.lib - pype.nukestudio.lib.setup() diff --git a/setup/nukestudio/hiero_plugin_path/Startup_old/selection_tracker.py b/setup/nukestudio/hiero_plugin_path/Startup_old/selection_tracker.py deleted file mode 100644 index b7e05fed7c..0000000000 --- a/setup/nukestudio/hiero_plugin_path/Startup_old/selection_tracker.py +++ /dev/null @@ -1,9 +0,0 @@ -"""Puts the selection project into 'hiero.selection'""" - -import hiero - - -def selectionChanged(event): - hiero.selection = event.sender.selection() - -hiero.core.events.registerInterest('kSelectionChanged', selectionChanged) diff --git a/setup/nukestudio/hiero_plugin_path/TaskPresets/11.2/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml b/setup/nukestudio/hiero_plugin_path/TaskPresets/11.2/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml new file mode 100644 index 0000000000..e24a4dbe4e --- /dev/null +++ b/setup/nukestudio/hiero_plugin_path/TaskPresets/11.2/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml @@ -0,0 +1,198 @@ + + 991 + //10.11.0.184/171001_ftrack/tgbvfx/editorial/nukestudio/workspace/ + 1 + True + 3 + + + {shot}/editorial_raw.%04d.{fileext} + + + default + exr + False + all + False + False + False + False + True + + + 8 bit + (auto detect) + True + False + + False + + None + None + None + None + None + None + None + None + None + + + Zip (16 scanline) + 32 bit float + False + False + False + channels, layers and views + 45.0 + False + all metadata + + Write_{ext} + + Cubic + None + 1.0 +
True
+ width +
+ False + Blend +
+
+
+ + {shot}/editorial.%04d.{ext} + + + default + exr + False + all + False + False + False + False + True + + + 8 bit + (auto detect) + True + False + + True + + None + None + None + None + None + None + None + None + None + + + Zip (16 scanline) + 16 bit half + False + False + False + channels, layers and views + 45.0 + False + all metadata + + Write_{ext} + + Cubic + To Sequence Resolution + 1.0 +
True
+ width +
+ False + Blend +
+
+
+ + {shot}/editorial.nk + + + True + default + mov + + rgb + False + + False + False + False + + True + True + + {shot}/editorial_raw.%04d.{fileext} + + + Cubic + None + 1.0 +
True
+ width +
+ False + Blend + False + True + True + + 0 + 40000000 + 12 + 31 + 2 + avc1 H.264 + Auto + mov32 + 20000 + + False + True + True + False + False + {shot}/editorial_raw.%04d.{fileext} + + None + None + None + None + None + None + None + None + None + + + 8 bit + (auto detect) + True + False + + Write_{ext} + False +
+
+
+
+ + + False + Custom + True + 10 +