From e397f441324083c435e777e72be90ad543d80f39 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Mon, 27 Sep 2021 14:46:41 +0200 Subject: [PATCH 1/2] pop keys that were removed during environments merging --- openpype/lib/applications.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/openpype/lib/applications.py b/openpype/lib/applications.py index 245f2ee9a2..6676f6e79f 100644 --- a/openpype/lib/applications.py +++ b/openpype/lib/applications.py @@ -1162,8 +1162,12 @@ def prepare_host_environments(data, implementation_envs=True): if final_env is None: final_env = loaded_env + keys_to_remove = set(data["env"].keys()) - set(final_env.keys()) + # Update env data["env"].update(final_env) + for key in keys_to_remove: + data["env"].pop(key, None) def apply_project_environments_value(project_name, env, project_settings=None): From 4c07c43a08aef252cacbfcdfa6e35b0606b1a921 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Mon, 27 Sep 2021 14:46:56 +0200 Subject: [PATCH 2/2] pop QT_AUTO_SCREEN_SCALE_FACTOR environmet variable before nuke launch --- openpype/hosts/nuke/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openpype/hosts/nuke/__init__.py b/openpype/hosts/nuke/__init__.py index f1e81617e0..366f704dd8 100644 --- a/openpype/hosts/nuke/__init__.py +++ b/openpype/hosts/nuke/__init__.py @@ -21,6 +21,7 @@ def add_implementation_envs(env, _app): new_nuke_paths.append(norm_path) env["NUKE_PATH"] = os.pathsep.join(new_nuke_paths) + env.pop("QT_AUTO_SCREEN_SCALE_FACTOR", None) # Try to add QuickTime to PATH quick_time_path = "C:/Program Files (x86)/QuickTime/QTSystem"