Merge branch 'develop' into bugfix/OP-6163_Bug-missing-time-information-on-publishes-from-Tray-Publisher

This commit is contained in:
Kayla Man 2023-07-12 11:58:25 +08:00
commit 910e104880
171 changed files with 4073 additions and 2379 deletions

View file

@ -615,8 +615,8 @@
"maskOverride": false,
"maskDriver": false,
"maskFilter": false,
"maskColor_manager": false,
"maskOperator": false
"maskOperator": false,
"maskColor_manager": false
},
"CreateVrayProxy": {
"enabled": true,

View file

@ -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": {}
}
},