From daccaf878f67429b522b7ae7c0255249ef0a316f Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 7 Feb 2024 15:07:25 +0100 Subject: [PATCH 1/2] use 'AYON_BLENDER_USER_SCRIPTS' over 'OPENPYPE_BLENDER_USER_SCRIPTS' --- client/ayon_core/hosts/blender/addon.py | 8 ++++---- client/ayon_core/hosts/blender/api/lib.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/ayon_core/hosts/blender/addon.py b/client/ayon_core/hosts/blender/addon.py index cf8321b51e..c3804382e5 100644 --- a/client/ayon_core/hosts/blender/addon.py +++ b/client/ayon_core/hosts/blender/addon.py @@ -35,10 +35,10 @@ def add_implementation_envs(self, env, _app): # loops - will be removed at the end previous_user_scripts.add(implementation_user_script_path) - openpype_blender_user_scripts = ( - env.get("OPENPYPE_BLENDER_USER_SCRIPTS") or "" + ayon_blender_user_scripts = ( + env.get("AYON_BLENDER_USER_SCRIPTS") or "" ) - for path in openpype_blender_user_scripts.split(os.pathsep): + for path in ayon_blender_user_scripts.split(os.pathsep): if path: previous_user_scripts.add(os.path.normpath(path)) @@ -53,7 +53,7 @@ def add_implementation_envs(self, env, _app): env["BLENDER_USER_SCRIPTS"] = implementation_user_script_path # Set custom user scripts env - env["OPENPYPE_BLENDER_USER_SCRIPTS"] = os.pathsep.join( + env["AYON_BLENDER_USER_SCRIPTS"] = os.pathsep.join( previous_user_scripts ) diff --git a/client/ayon_core/hosts/blender/api/lib.py b/client/ayon_core/hosts/blender/api/lib.py index a83c950b8f..458a275b51 100644 --- a/client/ayon_core/hosts/blender/api/lib.py +++ b/client/ayon_core/hosts/blender/api/lib.py @@ -123,7 +123,7 @@ def new_paths(): def append_user_scripts(): - user_scripts = os.environ.get("OPENPYPE_BLENDER_USER_SCRIPTS") + user_scripts = os.environ.get("AYON_BLENDER_USER_SCRIPTS") if not user_scripts: return @@ -142,7 +142,7 @@ def set_app_templates_path(): # We look among the scripts paths for one of the paths that contains # the app templates. The path must contain the subfolder # `startup/bl_app_templates_user`. - paths = os.environ.get("OPENPYPE_BLENDER_USER_SCRIPTS").split(os.pathsep) + paths = os.environ.get("AYON_BLENDER_USER_SCRIPTS").split(os.pathsep) app_templates_path = None for path in paths: From 8753da8a85b368e1e3076dd2b783aef46c478167 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 7 Feb 2024 17:03:59 +0100 Subject: [PATCH 2/2] change parent logger name --- client/ayon_core/hosts/blender/plugins/load/load_action.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/ayon_core/hosts/blender/plugins/load/load_action.py b/client/ayon_core/hosts/blender/plugins/load/load_action.py index 2690f2363e..5c8ba0df44 100644 --- a/client/ayon_core/hosts/blender/plugins/load/load_action.py +++ b/client/ayon_core/hosts/blender/plugins/load/load_action.py @@ -13,7 +13,7 @@ AVALON_PROPERTY, ) -logger = logging.getLogger("openpype").getChild("blender").getChild("load_action") +logger = logging.getLogger("ayon").getChild("blender").getChild("load_action") class BlendActionLoader(plugin.AssetLoader):