Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 16:34:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge develop into main

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

12
openpype/settings/defaults/system_settings/general.json
View file

@ -1,18 +1,10 @@
{
"studio_name": "Studio name",
"studio_code": "stu",
"admin_password": "",
"environment": {
"FFMPEG_PATH": {
"windows": "{OPENPYPE_ROOT}/vendor/bin/ffmpeg_exec/windows/bin",
"darwin": "{OPENPYPE_ROOT}/vendor/bin/ffmpeg_exec/darwin/bin",
"linux": ":{OPENPYPE_ROOT}/vendor/bin/ffmpeg_exec/linux"
},
"OPENPYPE_OCIO_CONFIG": "{STUDIO_SOFT}/OpenColorIO-Configs",
"__environment_keys__": {
"global": [
"FFMPEG_PATH",
"OPENPYPE_OCIO_CONFIG"
]
"global": []
}
},
"openpype_path": {