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 branch 'develop' into maya_py3_compatibility

Browse source
This commit is contained in:
Ondřej Samohel 2022-02-21 17:30:52 +01:00
commit 4d8afc671c
No known key found for this signature in database
GPG key ID: 02376E18990A97C6
417 changed files with 20399 additions and 386986 deletions
Download patch file Download diff file Expand all files Collapse all files

142
openpype/settings/defaults/system_settings/applications.json
View file

@ -121,7 +121,7 @@
"/opt/Autodesk/flame_2021/bin/flame.app/Contents/MacOS/startApp"
],
"linux": [
"/opt/Autodesk/flame_2021/bin/flame"
"/opt/Autodesk/flame_2021/bin/startApplication"
]
},
"arguments": {
@ -135,8 +135,31 @@
"OPENPYPE_WIRETAP_TOOLS": "/opt/Autodesk/wiretap/tools/2021"
}
},
"2021.1": {
"use_python_2": true,
"executables": {
"windows": [],
"darwin": [
"/opt/Autodesk/flame_2021.1/bin/flame.app/Contents/MacOS/startApp"
],
"linux": [
"/opt/Autodesk/flame_2021.1/bin/startApplication"
]
},
"arguments": {
"windows": [],
"darwin": [],
"linux": []
},
"environment": {
"OPENPYPE_FLAME_PYTHON_EXEC": "/opt/Autodesk/python/2021.1/bin/python2.7",
"OPENPYPE_FLAME_PYTHONPATH": "/opt/Autodesk/flame_2021.1/python",
"OPENPYPE_WIRETAP_TOOLS": "/opt/Autodesk/wiretap/tools/2021.1"
}
},
"__dynamic_keys_labels__": {
"2021": "2021 (Testing Only)"
"2021": "2021",
"2021.1": "2021.1"
}
}
},
@ -690,15 +713,29 @@
"OPENPYPE_LOG_NO_COLORS": "Yes"
},
"variants": {
"16": {
"enabled": true,
"variant_label": "16",
"use_python_2": false,
"17": {
"executables": {
"windows": [
"C:\\Program Files\\Blackmagic Design\\Fusion 17\\Fusion.exe"
],
"darwin": [],
"linux": []
},
"arguments": {
"windows": [],
"darwin": [],
"linux": []
},
"environment": {}
},
"16": {
"executables": {
"windows": [
"C:\\Program Files\\Blackmagic Design\\Fusion 16\\Fusion.exe"
],
"darwin": [],
"linux": []
},
"arguments": {
"windows": [],
"darwin": [],
@ -707,9 +744,6 @@
"environment": {}
},
"9": {
"enabled": true,
"variant_label": "9",
"use_python_2": false,
"executables": {
"windows": [
"C:\\Program Files\\Blackmagic Design\\Fusion 9\\Fusion.exe"
@ -934,12 +968,35 @@
"AVALON_HARMONY_WORKFILES_ON_LAUNCH": "1"
},
"variants": {
"21": {
"enabled": true,
"variant_label": "21",
"executables": {
"windows": [
"c:\\Program Files (x86)\\Toon Boom Animation\\Toon Boom Harmony 21 Premium\\win64\\bin\\HarmonyPremium.exe"
],
"darwin": [
"/Applications/Toon Boom Harmony 21 Premium/Harmony Premium.app/Contents/MacOS/Harmony Premium"
],
"linux": []
},
"arguments": {
"windows": [],
"darwin": [],
"linux": []
},
"environment": {}
},
"20": {
"enabled": true,
"variant_label": "20",
"executables": {
"windows": [],
"darwin": [],
"windows": [
"c:\\Program Files (x86)\\Toon Boom Animation\\Toon Boom Harmony 20 Premium\\win64\\bin\\HarmonyPremium.exe"
],
"darwin": [
"/Applications/Toon Boom Harmony 20 Premium/Harmony Premium.app/Contents/MacOS/Harmony Premium"
],
"linux": []
},
"arguments": {
@ -953,7 +1010,9 @@
"enabled": true,
"variant_label": "17",
"executables": {
"windows": [],
"windows": [
"c:\\Program Files (x86)\\Toon Boom Animation\\Toon Boom Harmony 17 Premium\\win64\\bin\\HarmonyPremium.exe"
],
"darwin": [
"/Applications/Toon Boom Harmony 17 Premium/Harmony Premium.app/Contents/MacOS/Harmony Premium"
],
@ -1127,7 +1186,9 @@
"darwin": [],
"linux": []
},
"environment": {}
"environment": {
"MULTIPROCESS": "No"
}
}
}
},
@ -1171,58 +1232,6 @@
}
}
},
"shell": {
"enabled": true,
"environment": {},
"variants": {
"python_3-7": {
"use_python_2": true,
"executables": {
"windows": [],
"darwin": [],
"linux": []
},
"arguments": {
"windows": [],
"darwin": [],
"linux": []
},
"environment": {}
},
"python_2-7": {
"use_python_2": true,
"executables": {
"windows": [],
"darwin": [],
"linux": []
},
"arguments": {
"windows": [],
"darwin": [],
"linux": []
},
"environment": {}
},
"terminal": {
"use_python_2": true,
"executables": {
"windows": [],
"darwin": [],
"linux": []
},
"arguments": {
"windows": [],
"darwin": [],
"linux": []
},
"environment": {}
},
"__dynamic_keys_labels__": {
"python_3-7": "Python 3.7",
"python_2-7": "Python 2.7"
}
}
},
"djvview": {
"enabled": true,
"label": "DJV View",
@ -1248,5 +1257,6 @@
"1-1": "1.1"
}
}
}
},
"additional_apps": {}
}

2
openpype/settings/defaults/system_settings/modules.json
View file

@ -13,7 +13,7 @@
}
},
"ftrack": {
"enabled": true,
"enabled": false,
"ftrack_server": "",
"ftrack_actions_path": {
"windows": [],