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 3.0/refactoring

Browse source
This commit is contained in:
iLLiCiTiT 2020-12-08 09:52:38 +01:00
commit 481ae14f38
22 changed files with 251 additions and 857 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pype/settings/defaults/system_settings/general.json
View file

@ -20,7 +20,8 @@
"PYPE_PROJECT_CONFIGS",
"PYPE_PYTHON_EXE",
"PYPE_OCIO_CONFIG",
"PYBLISH_GUI"
"PYBLISH_GUI",
"PYBLISHPLUGINPATH"
]
},
"FFMPEG_PATH": {
@ -45,6 +46,9 @@
"darwin": "{VIRTUAL_ENV}/bin/python"
},
"PYPE_OCIO_CONFIG": "{STUDIO_SOFT}/OpenColorIO-Configs",
"PYBLISH_GUI": "pyblish_pype"
"PYBLISH_GUI": "pyblish_pype",
"PYBLISHPLUGINPATH": [
"{PYPE_MODULE_ROOT}/pype/plugins/ftrack/publish"
]
}
}

29
pype/settings/defaults/system_settings/modules.json
View file

@ -43,8 +43,8 @@
"ftrack_server": "https://pype.ftrackapp.com",
"ftrack_actions_path": [],
"ftrack_events_path": [],
"FTRACK_EVENTS_MONGO_DB": "pype",
"FTRACK_EVENTS_MONGO_COL": "ftrack_events",
"mongo_database_name": "pype",
"mongo_collection_name": "ftrack_events",
"intent": {
"items": {
"-": "-",
@ -131,29 +131,6 @@
"read_security_role": []
}
}
},
"environment": {
"__environment_keys__": {
"ftrack": [
"FTRACK_ACTIONS_PATH",
"FTRACK_EVENTS_PATH",
"PYBLISHPLUGINPATH",
"PYTHONPATH"
]
},
"FTRACK_ACTIONS_PATH": [
"{PYPE_MODULE_ROOT}/pype/modules/ftrack/actions"
],
"FTRACK_EVENTS_PATH": [
"{PYPE_MODULE_ROOT}/pype/modules/ftrack/events"
],
"PYBLISHPLUGINPATH": [
"{PYPE_MODULE_ROOT}/pype/plugins/ftrack/publish"
],
"PYTHONPATH": [
"{PYPE_MODULE_ROOT}/pype/vendor",
"{PYTHONPATH}"
]
}
},
"Rest Api": {
@ -202,4 +179,4 @@
"Idle Manager": {
"enabled": true
}
}
}