Merge branch 'develop' into feature/OP-5207_Global-host-color-management-activation

This commit is contained in:
Jakub Ježek 2023-05-05 16:06:55 +02:00 committed by GitHub
commit 1cc60bb52a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
86 changed files with 4046 additions and 240 deletions

View file

@ -14,10 +14,14 @@
"RenderCreator": {
"defaults": [
"Main"
]
],
"mark_for_review": true
}
},
"publish": {
"CollectReview": {
"enabled": true
},
"ValidateSceneSettings": {
"enabled": true,
"optional": true,

View file

@ -1461,7 +1461,8 @@
},
"reference_loader": {
"namespace": "{asset_name}_{subset}_##_",
"group_name": "_GRP"
"group_name": "_GRP",
"display_handle": true
}
},
"workfile_build": {

View file

@ -0,0 +1,13 @@
{
"imageio": {
"ocio_config": {
"enabled": true,
"filepath": []
},
"file_rules": {
"enabled": true,
"rules": {}
}
},
"shelves": {}
}

View file

@ -1479,6 +1479,33 @@
}
}
},
"substancepainter": {
"enabled": true,
"label": "Substance Painter",
"icon": "app_icons/substancepainter.png",
"host_name": "substancepainter",
"environment": {},
"variants": {
"8-2-0": {
"executables": {
"windows": [
"C:\\Program Files\\Adobe\\Adobe Substance 3D Painter\\Adobe Substance 3D Painter.exe"
],
"darwin": [],
"linux": []
},
"arguments": {
"windows": [],
"darwin": [],
"linux": []
},
"environment": {}
},
"__dynamic_keys_labels__": {
"8-2-0": "8.2.0"
}
}
},
"unreal": {
"enabled": true,
"label": "Unreal Editor",