Merge remote-tracking branch 'origin/feature/906-hiero-convert-to-pype3' into feature/906-hiero-convert-to-pype3

This commit is contained in:
Jakub Jezek 2021-01-22 16:02:29 +01:00
commit 9a33397e42
No known key found for this signature in database
GPG key ID: C4B96E101D2A47F3
2 changed files with 17 additions and 11 deletions

View file

@ -36,7 +36,7 @@
}
},
"ValidateKnobs": {
"enabled": true,
"enabled": false,
"knobs": {
"render": {
"review": true
@ -44,7 +44,7 @@
}
},
"ExtractReviewDataLut": {
"enabled": true
"enabled": false
},
"ExtractReviewDataMov": {
"enabled": true,

View file

@ -235,17 +235,19 @@
"__environment_keys__": {
"nuke": [
"NUKE_PATH",
"PATH"
"PATH",
"LOGLEVEL"
]
},
"NUKE_PATH": [
"{PYPE_REPOS_ROOT}/avalon-core/setup/nuke/nuke_path",
"{PYPE_ROOT}/setup/nuke/nuke_path",
"{PYPE_ROOT}/repos/avalon-core/setup/nuke/nuke_path",
"{PYPE_ROOT}/pype/hosts/nuke/startup",
"{PYPE_STUDIO_PLUGINS}/nuke"
],
"PATH": {
"windows": "C:/Program Files (x86)/QuickTime/QTSystem/;{PATH}"
}
},
"LOGLEVEL": "DEBUG"
},
"variants": {
"nuke_12.2": {
@ -358,17 +360,19 @@
"__environment_keys__": {
"nukex": [
"NUKE_PATH",
"PATH"
"PATH",
"LOGLEVEL"
]
},
"NUKE_PATH": [
"{PYPE_REPOS_ROOT}/avalon-core/setup/nuke/nuke_path",
"{PYPE_ROOT}/setup/nuke/nuke_path",
"{PYPE_ROOT}/repos/avalon-core/setup/nuke/nuke_path",
"{PYPE_ROOT}/pype/hosts/nuke/startup",
"{PYPE_STUDIO_PLUGINS}/nuke"
],
"PATH": {
"windows": "C:/Program Files (x86)/QuickTime/QTSystem/;{PATH}"
}
},
"LOGLEVEL": "DEBUG"
},
"variants": {
"nukex_12.2": {
@ -809,6 +813,8 @@
},
"PYTHONPATH": [
"{PYTHON36_RESOLVE}/Lib/site-packages",
"{VIRTUAL_ENV}/Lib/site-packages",
"{PYTHONPATH}",
"{RESOLVE_SCRIPT_API}/Modules",
"{PYTHONPATH}"
],
@ -817,7 +823,7 @@
"{PYTHON36_RESOLVE}/Scripts",
"{PATH}"
],
"PRE_PYTHON_SCRIPT": "{PYPE_ROOT}/pype/resolve/preload_console.py",
"PRE_PYTHON_SCRIPT": "{PYPE_MODULE_ROOT}/pype/resolve/preload_console.py",
"PYPE_LOG_NO_COLORS": "True",
"RESOLVE_DEV": "True"
},