Merge branch 'develop' of github.com:ynput/OpenPype into feature/OP-4845_Deadline-Addon

This commit is contained in:
Petr Kalis 2023-08-02 14:49:36 +02:00
commit aa5d8beec7
3 changed files with 8 additions and 3 deletions

View file

@ -12,6 +12,11 @@ class UnrealAddon(OpenPypeModule, IHostAddon):
def initialize(self, module_settings):
self.enabled = True
def get_global_environments(self):
return {
"AYON_UNREAL_ROOT": UNREAL_ROOT_DIR,
}
def add_implementation_envs(self, env, app):
"""Modify environments to contain all required for implementation."""
# Set AYON_UNREAL_PLUGIN required for Unreal implementation

@ -1 +1 @@
Subproject commit ff15c700771e719cc5f3d561ac5d6f7590623986
Subproject commit 63266607ceb972a61484f046634ddfc9eb0b5757

View file

@ -369,11 +369,11 @@ def get_compatible_integration(
def get_path_to_cmdlet_project(ue_version: str) -> Path:
cmd_project = Path(
os.path.abspath(os.getenv("OPENPYPE_ROOT")))
os.path.dirname(os.path.abspath(__file__)))
# For now, only tested on Windows (For Linux and Mac
# it has to be implemented)
cmd_project /= f"openpype/hosts/unreal/integration/UE_{ue_version}"
cmd_project /= f"integration/UE_{ue_version}"
# if the integration doesn't exist for current engine version
# try to find the closest to it.