Skip to content

Commit

Permalink
Merge pull request #2 from ynput/enhancement/blender-env-variable
Browse files Browse the repository at this point in the history
Blender: Env variable to user scripts
  • Loading branch information
iLLiCiTiT authored Feb 7, 2024
2 parents b413f52 + 8753da8 commit 6c511ec
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions client/ayon_core/hosts/blender/addon.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand All @@ -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
)

Expand Down
4 changes: 2 additions & 2 deletions client/ayon_core/hosts/blender/api/lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion client/ayon_core/hosts/blender/plugins/load/load_action.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down

0 comments on commit 6c511ec

Please sign in to comment.