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

Merge branch 'develop' into enhancement/OP-7072_Validate-Loaded-Plugins

Browse source
This commit is contained in:
Kayla Man 2023-11-15 21:05:25 +08:00
commit 45f0e8de59
118 changed files with 10392 additions and 358 deletions
Download patch file Download diff file Expand all files Collapse all files

2
openpype/settings/entities/dict_conditional.py
View file

@ -352,7 +352,7 @@ class DictConditionalEntity(ItemEntity):
break
if result_key is None:
raise ValueError("Didn't found child {}".format(child_obj))
raise ValueError("Didn't find child {}".format(child_obj))
return "/".join([self.path, result_key])

2
openpype/settings/entities/dict_immutable_keys_entity.py
View file

@ -232,7 +232,7 @@ class DictImmutableKeysEntity(ItemEntity):
break
if result_key is None:
raise ValueError("Didn't found child {}".format(child_obj))
raise ValueError("Didn't find child {}".format(child_obj))
return "/".join([self.path, result_key])

2
openpype/settings/entities/dict_mutable_keys_entity.py
View file

@ -284,7 +284,7 @@ class DictMutableKeysEntity(EndpointEntity):
break
if result_key is None:
raise ValueError("Didn't found child {}".format(child_obj))
raise ValueError("Didn't find child {}".format(child_obj))
return "/".join([self.path, result_key])

2
openpype/settings/entities/item_entities.py
View file

@ -295,7 +295,7 @@ class ListStrictEntity(ItemEntity):
break
if result_idx is None:
raise ValueError("Didn't found child {}".format(child_obj))
raise ValueError("Didn't find child {}".format(child_obj))
return "/".join([self.path, str(result_idx)])

2
openpype/settings/entities/list_entity.py
View file

@ -258,7 +258,7 @@ class ListEntity(EndpointEntity):
break
if result_idx is None:
raise ValueError("Didn't found child {}".format(child_obj))
raise ValueError("Didn't find child {}".format(child_obj))
return "/".join([self.path, str(result_idx)])

2
openpype/settings/entities/root_entities.py
View file

@ -270,7 +270,7 @@ class RootEntity(BaseItemEntity):
for key, _child_entity in self.non_gui_children.items():
if _child_entity is child_entity:
return key
raise ValueError("Didn't found child {}".format(child_entity))
raise ValueError("Didn't find child {}".format(child_entity))
@property
def value(self):

98
openpype/settings/entities/schemas/projects_schema/schema_project_max.json
View file

@ -65,6 +65,104 @@
}
]
},
{
"type": "dict",
"collapsible": true,
"key": "CreateReview",
"label": "Create Review",
"children": [
{
"type": "number",
"key": "review_width",
"label": "Review Width"
},
{
"type": "number",
"key": "review_height",
"label": "Review Height"
},
{
"type": "number",
"key": "percentSize",
"label": "Percent of Output"
},
{
"type": "boolean",
"key": "keep_images",
"label": "Keep Image Sequences"
},
{
"key": "image_format",
"label": "Image Format Options",
"type": "enum",
"multiselection": false,
"defaults": "exr",
"enum_items": [
{"exr": "exr"},
{"jpg": "jpg"},
{"png": "png"},
{"tga": "tga"}
]
},
{
"key": "visual_style",
"label": "Preference",
"type": "enum",
"multiselection": false,
"defaults": "Realistic",
"enum_items": [
{"Realistic": "Realistic"},
{"Shaded": "Shaded"},
{"Facets": "Facets"},
{"ConsistentColors": "ConsistentColors"},
{"HiddenLine": "HiddenLine"},
{"Wireframe": "Wireframe"},
{"BoundingBox": "BoundingBox"},
{"Ink": "Ink"},
{"ColorInk": "ColorInk"},
{"Acrylic": "Acrylic"},
{"Tech": "Tech"},
{"Graphite": "Graphite"},
{"ColorPencil": "ColorPencil"},
{"Pastel": "Pastel"},
{"Clay": "Clay"},
{"ModelAssist": "ModelAssist"}
]
},
{
"key": "viewport_preset",
"label": "Pre-View Preset",
"type": "enum",
"multiselection": false,
"defaults": "Quality",
"enum_items": [
{"Quality": "Quality"},
{"Standard": "Standard"},
{"Performance": "Performance"},
{"DXMode": "DXMode"},
{"Customize": "Customize"}
]
},
{
"key": "anti_aliasing",
"label": "Anti-aliasing Quality",
"type": "enum",
"multiselection": false,
"defaults": "None",
"enum_items": [
{"None": "None"},
{"2X": "2X"},
{"4X": "4X"},
{"8X": "8X"}
]
},
{
"type": "boolean",
"key": "vp_texture",
"label": "Viewport Texture"
}
]
},
{
"type": "dict",
"collapsible": true,

16
openpype/settings/entities/schemas/projects_schema/schemas/schema_blender_publish.json
View file

@ -79,6 +79,22 @@
}
]
},
{
"type": "collapsible-wrap",
"label": "BlendScene",
"children": [
{
"type": "schema_template",
"name": "template_publish_plugin",
"template_data": [
{
"key": "ValidateInstanceEmpty",
"label": "Validate Instance is not Empty"
}
]
}
]
},
{
"type": "collapsible-wrap",
"label": "Render",