Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 21:04:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

adding input arguments for env

Browse source
This commit is contained in:
Jakub Jezek 2023-08-04 16:25:50 +02:00
parent 86f39e8e8f
commit 0a765c4528
No known key found for this signature in database
GPG key ID: 730D7C02726179A7
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
openpype/hooks/pre_ocio_hook.py
View file

@ -38,7 +38,8 @@ class OCIOEnvHook(PreLaunchHook):
host_name=self.host_name,
project_settings=self.data["project_settings"],
anatomy_data=template_data,
anatomy=self.data["anatomy"]
anatomy=self.data["anatomy"],
environment=self.launch_context.env,
)
if config_data:

15
openpype/pipeline/colorspace.py
View file

@ -329,7 +329,8 @@ def get_imageio_config(
host_name,
project_settings=None,
anatomy_data=None,
anatomy=None
anatomy=None,
env=None
):
"""Returns config data from settings
@ -342,6 +343,7 @@ def get_imageio_config(
project_settings (Optional[dict]): Project settings.
anatomy_data (Optional[dict]): anatomy formatting data.
anatomy (Optional[Anatomy]): Anatomy object.
env (Optional[dict]): Environment variables.
Returns:
dict: config path data or empty dict
@ -414,13 +416,13 @@ def get_imageio_config(
if override_global_config:
config_data = _get_config_data(
host_ocio_config["filepath"], formatting_data
host_ocio_config["filepath"], formatting_data, env
)
else:
# get config path from global
config_global = imageio_global["ocio_config"]
config_data = _get_config_data(
config_global["filepath"], formatting_data
config_global["filepath"], formatting_data, env
)
if not config_data:
@ -432,7 +434,7 @@ def get_imageio_config(
return config_data
def _get_config_data(path_list, anatomy_data):
def _get_config_data(path_list, anatomy_data, env=None):
"""Return first existing path in path list.
If template is used in path inputs,
@ -442,14 +444,17 @@ def _get_config_data(path_list, anatomy_data):
Args:
path_list (list[str]): list of abs paths
anatomy_data (dict): formatting data
env (Optional[dict]): Environment variables.
Returns:
dict: config data
"""
formatting_data = deepcopy(anatomy_data)
environment_vars = env or dict(**os.environ)
# format the path for potential env vars
formatting_data.update(dict(**os.environ))
formatting_data.update(environment_vars)
# first try host config paths
for path_ in path_list: