From 282a0ea301a4ba42a976b19ee9f2e56ff9f4669e Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Tue, 16 Feb 2021 18:24:32 +0100 Subject: [PATCH] load global plugins from pype/plugins/plugintype --- pype/__init__.py | 4 ++-- pype/lib/plugin_tools.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pype/__init__.py b/pype/__init__.py index c7b698a9ae..400bf4c7bb 100644 --- a/pype/__init__.py +++ b/pype/__init__.py @@ -18,8 +18,8 @@ PACKAGE_DIR = os.path.dirname(os.path.abspath(__file__)) PLUGINS_DIR = os.path.join(PACKAGE_DIR, "plugins") # Global plugin paths -PUBLISH_PATH = os.path.join(PLUGINS_DIR, "global", "publish") -LOAD_PATH = os.path.join(PLUGINS_DIR, "global", "load") +PUBLISH_PATH = os.path.join(PLUGINS_DIR, "publish") +LOAD_PATH = os.path.join(PLUGINS_DIR, "load") def import_wrapper(func): diff --git a/pype/lib/plugin_tools.py b/pype/lib/plugin_tools.py index 642c72ae80..c03d978ad4 100644 --- a/pype/lib/plugin_tools.py +++ b/pype/lib/plugin_tools.py @@ -41,13 +41,12 @@ def filter_pyblish_plugins(plugins): file = os.path.normpath(inspect.getsourcefile(plugin)) file = os.path.normpath(file) - # host determined from path host_from_file = file.split(os.path.sep)[-4:-3][0] plugin_kind = file.split(os.path.sep)[-2:-1][0] # TODO: change after all plugins are moved one level up - if host_from_file == "plugins": + if host_from_file == "pype": host_from_file = "global" try: