Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 21:04:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/key_validations

Browse source
This commit is contained in:
Milan Kolar 2021-03-26 10:24:16 +01:00 • committed by GitHub
commit bcae09edd1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 62 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pype/hosts/houdini/startup/MainMenuCommon.XML
View file

@ -2,7 +2,7 @@
<mainMenu>
<menuBar>
<subMenu id="avalon_menu">
<label>Avalon</label>
<label>Pype</label>
<subMenu id="avalon_context">
<labelExpression><![CDATA[
from avalon import api
@ -58,7 +58,7 @@ publish.show(parent)
<label>Work Files</label>
<scriptCode><![CDATA[
import hou, os
from avalon.tools import workfiles
from pype.tools import workfiles
workfiles.show(os.environ["AVALON_WORKDIR"])
]]></scriptCode>
</scriptItem>

4
pype/hosts/houdini/startup/scripts/123.py
View file

@ -1,10 +1,10 @@
from avalon import pipeline, houdini
from avalon import api, houdini
import hou
def main():
print("Installing Avalon ...")
pipeline.install(houdini)
api.install(houdini)
main()

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

@ -3,6 +3,7 @@
"MayaSubmitDeadline": {
"enabled": true,
"optional": false,
"active": true,
"tile_assembler_plugin": "oiio",
"use_published": true,
"asset_dependencies": true,
@ -12,6 +13,7 @@
"NukeSubmitDeadline": {
"enabled": true,
"optional": false,
"active": true,
"use_published": true,
"priority": 50,
"chunk_size": 10,
@ -23,6 +25,7 @@
"HarmonySubmitDeadline": {
"enabled": true,
"optional": false,
"active": true,
"use_published": true,
"priority": 50,
"chunk_size": 10000,
@ -34,6 +37,7 @@
"AfterEffectsSubmitDeadline": {
"enabled": true,
"optional": false,
"active": true,
"use_published": true,
"priority": 50,
"chunk_size": 10000,

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

@ -379,6 +379,7 @@
"ExtractCameraAlembic": {
"enabled": true,
"optional": true,
"active": true,
"bake_attributes": []
},
"MayaSubmitDeadline": {

23
pype/settings/defaults/system_settings/applications.json
View file

@ -992,6 +992,29 @@
}
},
"variants": {
"houdini_18.5": {
"enabled": true,
"label": "",
"variant_label": "18.5",
"icon": "",
"executables": {
"windows": [
"C:\\Program Files\\Side Effects Software\\Houdini 18.5.499\\bin\\houdini.exe"
],
"darwin": [],
"linux": []
},
"arguments": {
"windows": [],
"darwin": [],
"linux": []
},
"environment": {
"__environment_keys__": {
"houdini_18.5": []
}
}
},
"houdini_18": {
"enabled": true,
"label": "",

20
pype/settings/entities/schemas/projects_schema/schema_project_deadline.json
View file

@ -29,6 +29,11 @@
"key": "optional",
"label": "Optional"
},
{
"type": "boolean",
"key": "active",
"label": "Active"
},
{
"type": "enum",
"key": "tile_assembler_plugin",
@ -83,6 +88,11 @@
"key": "optional",
"label": "Optional"
},
{
"type": "boolean",
"key": "active",
"label": "Active"
},
{
"type": "boolean",
"key": "use_published",
@ -137,6 +147,11 @@
"key": "optional",
"label": "Optional"
},
{
"type": "boolean",
"key": "active",
"label": "Active"
},
{
"type": "boolean",
"key": "use_published",
@ -191,6 +206,11 @@
"key": "optional",
"label": "Optional"
},
{
"type": "boolean",
"key": "active",
"label": "Active"
},
{
"type": "boolean",
"key": "use_published",

5
pype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json
View file

@ -271,6 +271,11 @@
"key": "optional",
"label": "Optional"
},
{
"type": "boolean",
"key": "active",
"label": "Active"
},
{
"type": "raw-json",
"key": "bake_attributes",

5
pype/settings/entities/schemas/system_schema/host_settings/schema_houdini.json
View file

@ -28,6 +28,11 @@
"type": "schema_template",
"name": "template_host_variant",
"template_data": [
{
"app_variant_label": "18.5",
"app_variant": "18-5",
"app_name": "houdini"
},
{
"app_variant_label": "18",
"app_variant": "18",