Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 16:34:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Automated] Merged develop into main

Browse source
This commit is contained in:
pypebot 2021-09-29 05:34:10 +02:00 • committed by GitHub
commit de3072e116
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
openpype/hosts/nuke/__init__.py
View file

@ -21,6 +21,7 @@ def add_implementation_envs(env, _app):
new_nuke_paths.append(norm_path) new_nuke_paths.append(norm_path)
env["NUKE_PATH"] = os.pathsep.join(new_nuke_paths) env["NUKE_PATH"] = os.pathsep.join(new_nuke_paths)
env.pop("QT_AUTO_SCREEN_SCALE_FACTOR", None)
# Try to add QuickTime to PATH # Try to add QuickTime to PATH
quick_time_path = "C:/Program Files (x86)/QuickTime/QTSystem" quick_time_path = "C:/Program Files (x86)/QuickTime/QTSystem"

4
openpype/lib/applications.py
View file

@ -1162,8 +1162,12 @@ def prepare_host_environments(data, implementation_envs=True):
if final_env is None: if final_env is None:
final_env = loaded_env final_env = loaded_env
keys_to_remove = set(data["env"].keys()) - set(final_env.keys())
# Update env # Update env
data["env"].update(final_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): def apply_project_environments_value(project_name, env, project_settings=None):