mirror of
https://github.com/ynput/ayon-core.git
synced 2026-01-01 16:34:53 +01:00
Merge branch 'develop' into bugfix/OP-6163_Bug-missing-time-information-on-publishes-from-Tray-Publisher
This commit is contained in:
commit
910e104880
171 changed files with 4073 additions and 2379 deletions
|
|
@ -615,8 +615,8 @@
|
|||
"maskOverride": false,
|
||||
"maskDriver": false,
|
||||
"maskFilter": false,
|
||||
"maskColor_manager": false,
|
||||
"maskOperator": false
|
||||
"maskOperator": false,
|
||||
"maskColor_manager": false
|
||||
},
|
||||
"CreateVrayProxy": {
|
||||
"enabled": true,
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
"imageio": {
|
||||
"activate_host_color_management": true,
|
||||
"ocio_config": {
|
||||
"override_global_config": true,
|
||||
"override_global_config": false,
|
||||
"filepath": []
|
||||
},
|
||||
"file_rules": {
|
||||
"activate_host_rules": true,
|
||||
"activate_host_rules": false,
|
||||
"rules": {}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue