Merge branch 'develop' into feature/PYPE-1897_publishing-tvp-with-studio-rendering

This commit is contained in:
iLLiCiTiT 2021-11-18 13:21:49 +01:00
commit 123e3bc4f8
78 changed files with 6153 additions and 1435 deletions

View file

@ -167,6 +167,16 @@
"ffmpeg": 48
}
},
"royalrender": {
"enabled": false,
"rr_paths": {
"default": {
"windows": "",
"darwin": "",
"linux": ""
}
}
},
"log_viewer": {
"enabled": true
},