merge develop into main

This commit is contained in:
Milan Kolar 2021-05-04 17:07:32 +02:00
parent f82ed5e127
commit a8ac7cd538
418 changed files with 26017 additions and 4665 deletions

View file

@ -1,5 +1,4 @@
import os
from openpype.settings import get_environments
def env_value_to_bool(env_key=None, value=None, default=False):
@ -89,6 +88,7 @@ def get_global_environments(env=None):
"""
import acre
from openpype.modules import ModulesManager
from openpype.settings import get_environments
if env is None:
env = {}