paths are correct and metadata presets are with metadata

This commit is contained in:
iLLiCiTiT 2020-07-24 18:08:35 +02:00
parent cbb77c05b1
commit 5ba9eb2eed
2 changed files with 4 additions and 4 deletions

View file

@ -8,8 +8,7 @@ def folder_up(path, times=1):
return folder_up(os.path.dirname(path), times - 1) return folder_up(os.path.dirname(path), times - 1)
PYPE_SETUP_PATH = folder_up(__file__, 6) PYPE_SETUP_PATH = folder_up(os.path.realpath(__file__), 6)
os.environ["PYPE_CONFIG"] = os.path.join( os.environ["PYPE_CONFIG"] = os.path.join(
PYPE_SETUP_PATH, "repos", "pype-config" PYPE_SETUP_PATH, "repos", "pype-config"
) )
@ -19,8 +18,7 @@ sys_paths = (
PYPE_SETUP_PATH, PYPE_SETUP_PATH,
os.path.join(PYPE_SETUP_PATH, "repos", "pype"), os.path.join(PYPE_SETUP_PATH, "repos", "pype"),
os.path.join(PYPE_SETUP_PATH, "repos", "avalon-core"), os.path.join(PYPE_SETUP_PATH, "repos", "avalon-core"),
os.path.join(PYPE_SETUP_PATH, "repos", "pyblish-base"), os.path.join(PYPE_SETUP_PATH, "repos", "pyblish-base")
os.path.join(PYPE_SETUP_PATH, "repos", "pype-config"),
) )
for path in sys_paths: for path in sys_paths:
sys.path.append(path) sys.path.append(path)

View file

@ -160,10 +160,12 @@ def global_project_presets(**kwargs):
def studio_presets_with_metadata(*args, **kwargs): def studio_presets_with_metadata(*args, **kwargs):
kwargs["with_metadata"] = True
return load_jsons_from_dir(studio_presets_path, *args, **kwargs) return load_jsons_from_dir(studio_presets_path, *args, **kwargs)
def global_project_presets_with_metadata(**kwargs): def global_project_presets_with_metadata(**kwargs):
kwargs["with_metadata"] = True
return load_jsons_from_dir(project_presets_path, **kwargs) return load_jsons_from_dir(project_presets_path, **kwargs)