Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 16:34:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into 3.0/refactoring

Browse source
This commit is contained in:
iLLiCiTiT 2020-12-07 15:46:41 +01:00
commit d44d63cdc0
64 changed files with 1644 additions and 1302 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pype/settings/defaults/project_settings/ftrack.json
View file

@ -93,6 +93,10 @@
"enabled": true,
"note_with_intent_template": "",
"note_labels": []
},
"ValidateFtrackAttributes": {
"enabled": false,
"ftrack_custom_attributes": {}
}
}
}

8
pype/settings/defaults/project_settings/global.json
View file

@ -94,8 +94,8 @@
"deadline_department": "",
"deadline_pool": "",
"deadline_group": "",
"deadline_chunk_size": "",
"deadline_priority": "",
"deadline_chunk_size": 1,
"deadline_priority": 50,
"aov_filter": {
"maya": [
".+(?:\\.|_)([Bb]eauty)(?:\\.|_).*"
@ -111,7 +111,7 @@
}
},
"tools": {
"Creator": {
"creator": {
"families_smart_select": {
"Render": [
"light",
@ -179,4 +179,4 @@
}
}
}
}
}

10
pype/settings/defaults/project_settings/maya.json
View file

@ -1,5 +1,5 @@
{
"maya_capture": {
"capture": {
"Codec": {
"compression": "jpg",
"format": "image",
@ -107,9 +107,10 @@
"overscan": 1.0
}
},
"ext_mapping": {},
"publish": {
"CollectMayaRender": {
"sync_workfile_version": true
"sync_workfile_version": false
},
"ValidateCameraAttributes": {
"enabled": true,
@ -134,6 +135,9 @@
"ValidateMeshHasOverlappingUVs": {
"enabled": false
},
"ValidateAttributes": {
"enabled": false
},
"ExtractCameraAlembic": {
"enabled": true,
"optional": true,
@ -316,4 +320,4 @@
"ValidateNoAnimation": false
}
}
}
}

4
pype/settings/defaults/project_settings/nuke.json
View file

@ -35,7 +35,7 @@
]
}
},
"ValidateNukeWriteKnobs": {
"ValidateKnobs": {
"enabled": true,
"knobs": {
"render": {
@ -87,4 +87,4 @@
]
},
"filters": {}
}
}

2
pype/settings/defaults/project_settings/standalonepublisher.json
View file

@ -123,4 +123,4 @@
"help": "Script exported from matchmoving application"
}
}
}
}

4
pype/settings/defaults/system_settings/modules.json
View file

@ -169,11 +169,11 @@
"enabled": false,
"workspace_name": "studio name"
},
"Deadline": {
"deadline": {
"enabled": true,
"DEADLINE_REST_URL": "http://localhost:8082"
},
"Muster": {
"muster": {
"enabled": false,
"MUSTER_REST_URL": "http://127.0.0.1:9890",
"templates_mapping": {