Merge remote-tracking branch 'upstream/main' into gallowj/main/DCCsi

2021-05-26 15:45:07 -05:00
parent 55b0a93fd6 6c17c7bfb3
commit 5284cf5d62
182 changed files with 3841 additions and 1415 deletions
@@ -384,8 +384,7 @@ def stash_env(_SYNTH_ENV_DICT = OrderedDict()):
    # changed to just make the fallback what is set in boostrap
    # so now it's less of a fallnack and more correct if not
    # explicitly set
-    _LY_PROJECT = os.getenv(ENVAR_LY_PROJECT,
-                            get_current_project(_LY_DEV))
+    _LY_PROJECT = os.getenv(ENVAR_LY_PROJECT)
    _SYNTH_ENV_DICT[ENVAR_LY_PROJECT] = _LY_PROJECT
    
    _LY_BUILD_DIR_NAME = os.getenv(ENVAR_LY_BUILD_DIR_NAME,