From c0eed0dc141b6b1bf633f9ac0d398969f37ebbdf Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Wed, 16 Feb 2022 16:37:16 +0100 Subject: [PATCH] flame: adding startup folder to environ var refactory to use `DL_PYTHON_HOOK_PATH` also cover `QT_AUTO_SCREEN_SCALE_FACTOR` issue --- openpype/hosts/flame/__init__.py | 18 ++++++++++++++++++ openpype/hosts/flame/hooks/pre_flame_setup.py | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/flame/__init__.py b/openpype/hosts/flame/__init__.py index 02befa76e2..1c9fa099da 100644 --- a/openpype/hosts/flame/__init__.py +++ b/openpype/hosts/flame/__init__.py @@ -3,3 +3,21 @@ import os HOST_DIR = os.path.dirname( os.path.abspath(__file__) ) + + +def add_implementation_envs(env, _app): + # Add requirements to DL_PYTHON_HOOK_PATH + pype_root = os.environ["OPENPYPE_REPOS_ROOT"] + new_flame_paths = os.path.join( + pype_root, "openpype", "hosts", "flame", "startup") + + env["DL_PYTHON_HOOK_PATH"] = os.pathsep.join(new_flame_paths) + env.pop("QT_AUTO_SCREEN_SCALE_FACTOR", None) + + # Set default values if are not already set via settings + defaults = { + "LOGLEVEL": "DEBUG" + } + for key, value in defaults.items(): + if not env.get(key): + env[key] = value diff --git a/openpype/hosts/flame/hooks/pre_flame_setup.py b/openpype/hosts/flame/hooks/pre_flame_setup.py index e8bdd840f4..94703396b9 100644 --- a/openpype/hosts/flame/hooks/pre_flame_setup.py +++ b/openpype/hosts/flame/hooks/pre_flame_setup.py @@ -4,7 +4,9 @@ import tempfile import contextlib import socket from openpype.lib import ( - PreLaunchHook, get_openpype_username) + PreLaunchHook, + get_openpype_username +) from openpype.hosts import flame as opflame import openpype.hosts.flame.api as opfapi import openpype