mirror of
https://github.com/ynput/ayon-core.git
synced 2026-01-02 00:44:52 +01:00
Merge branch 'develop' into feature/global-collect-audio-plugin
This commit is contained in:
Jakub Jezek
commit
7668fb830c
578 changed files with 42504 additions and 4815 deletions
|
|
@ -2,5 +2,69 @@
|
|||
"workfile_builder": {
|
||||
"create_first_version": false,
|
||||
"custom_templates": []
|
||||
},
|
||||
"publish": {
|
||||
"ValidateCameraZeroKeyframe": {
|
||||
"enabled": true,
|
||||
"optional": true,
|
||||
"active": true
|
||||
},
|
||||
"ValidateMeshHasUvs": {
|
||||
"enabled": true,
|
||||
"optional": true,
|
||||
"active": true
|
||||
},
|
||||
"ValidateMeshNoNegativeScale": {
|
||||
"enabled": true,
|
||||
"optional": false,
|
||||
"active": true
|
||||
},
|
||||
"ValidateTransformZero": {
|
||||
"enabled": true,
|
||||
"optional": false,
|
||||
"active": true
|
||||
},
|
||||
"ExtractBlend": {
|
||||
"enabled": true,
|
||||
"optional": true,
|
||||
"active": true,
|
||||
"families": [
|
||||
"model",
|
||||
"camera",
|
||||
"rig",
|
||||
"action",
|
||||
"layout"
|
||||
]
|
||||
},
|
||||
"ExtractBlendAnimation": {
|
||||
"enabled": true,
|
||||
"optional": true,
|
||||
"active": true
|
||||
},
|
||||
"ExtractCamera": {
|
||||
"enabled": true,
|
||||
"optional": true,
|
||||
"active": true
|
||||
},
|
||||
"ExtractFBX": {
|
||||
"enabled": true,
|
||||
"optional": true,
|
||||
"active": false
|
||||
},
|
||||
"ExtractAnimationFBX": {
|
||||
"enabled": true,
|
||||
"optional": true,
|
||||
"active": false
|
||||
},
|
||||
"ExtractABC": {
|
||||
"enabled": true,
|
||||
"optional": true,
|
||||
"active": false
|
||||
},
|
||||
"ExtractLayout": {
|
||||
"enabled": true,
|
||||
"optional": true,
|
||||
"active": false
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@
|
|||
"Not Ready"
|
||||
],
|
||||
"__ignore__": [
|
||||
"in prgoress",
|
||||
"in progress",
|
||||
"omitted",
|
||||
"on hold"
|
||||
]
|
||||
|
|
@ -96,10 +96,6 @@
|
|||
"mapping": {},
|
||||
"asset_types_to_skip": []
|
||||
},
|
||||
"first_version_status": {
|
||||
"enabled": true,
|
||||
"status": ""
|
||||
},
|
||||
"next_task_update": {
|
||||
"enabled": true,
|
||||
"mapping": {
|
||||
|
|
|
|||
|
|
@ -47,6 +47,18 @@
|
|||
}
|
||||
},
|
||||
"publish": {
|
||||
"ValidateWorkfilePaths": {
|
||||
"enabled": true,
|
||||
"optional": true,
|
||||
"node_types": [
|
||||
"file",
|
||||
"alembic"
|
||||
],
|
||||
"prohibited_vars": [
|
||||
"$HIP",
|
||||
"$JOB"
|
||||
]
|
||||
},
|
||||
"ValidateContainers": {
|
||||
"enabled": true,
|
||||
"optional": true,
|
||||
|
|
|
|||
|
|
@ -1,8 +1,4 @@
|
|||
{
|
||||
"entities_root": {
|
||||
"assets": "Assets",
|
||||
"shots": "Shots"
|
||||
},
|
||||
"entities_naming_pattern": {
|
||||
"episode": "E##",
|
||||
"sequence": "SQ##",
|
||||
|
|
|
|||
|
|
@ -980,4 +980,4 @@
|
|||
"ValidateNoAnimation": false
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -131,7 +131,7 @@
|
|||
"write"
|
||||
]
|
||||
},
|
||||
"ValidateInstanceInContext": {
|
||||
"ValidateCorrectAssetName": {
|
||||
"enabled": true,
|
||||
"optional": true,
|
||||
"active": true
|
||||
|
|
@ -325,5 +325,8 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
"templated_workfile_build": {
|
||||
"profiles": []
|
||||
},
|
||||
"filters": {}
|
||||
}
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
},
|
||||
"publish": {
|
||||
"CollectColorCodedInstances": {
|
||||
"create_flatten_image": false,
|
||||
"create_flatten_image": "no",
|
||||
"flatten_subset_template": "",
|
||||
"color_code_mapping": []
|
||||
},
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ from .exceptions import (
|
|||
EntitySchemaError
|
||||
)
|
||||
|
||||
from openpype.lib import PypeLogger
|
||||
from openpype.lib import Logger
|
||||
|
||||
|
||||
@six.add_metaclass(ABCMeta)
|
||||
|
|
@ -478,7 +478,7 @@ class BaseItemEntity(BaseEntity):
|
|||
def log(self):
|
||||
"""Auto created logger for debugging or warnings."""
|
||||
if self._log is None:
|
||||
self._log = PypeLogger.get_logger(self.__class__.__name__)
|
||||
self._log = Logger.get_logger(self.__class__.__name__)
|
||||
return self._log
|
||||
|
||||
@abstractproperty
|
||||
|
|
|
|||
|
|
@ -12,6 +12,10 @@
|
|||
"workfile_builder/builder_on_start",
|
||||
"workfile_builder/profiles"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "schema",
|
||||
"name": "schema_blender_publish"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -299,24 +299,6 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "dict",
|
||||
"key": "first_version_status",
|
||||
"label": "Set status on first created version",
|
||||
"checkbox_key": "enabled",
|
||||
"children": [
|
||||
{
|
||||
"type": "boolean",
|
||||
"key": "enabled",
|
||||
"label": "Enabled"
|
||||
},
|
||||
{
|
||||
"type": "text",
|
||||
"key": "status",
|
||||
"label": "Status"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "dict",
|
||||
"key": "next_task_update",
|
||||
|
|
@ -986,7 +968,7 @@
|
|||
{
|
||||
"type": "dict",
|
||||
"key": "IntegrateFtrackInstance",
|
||||
"label": "IntegrateFtrackInstance",
|
||||
"label": "Integrate Ftrack Instance",
|
||||
"is_group": true,
|
||||
"children": [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -10,22 +10,8 @@
|
|||
"name": "schema_houdini_create"
|
||||
},
|
||||
{
|
||||
"type": "dict",
|
||||
"collapsible": true,
|
||||
"key": "publish",
|
||||
"label": "Publish plugins",
|
||||
"children": [
|
||||
{
|
||||
"type": "schema_template",
|
||||
"name": "template_publish_plugin",
|
||||
"template_data": [
|
||||
{
|
||||
"key": "ValidateContainers",
|
||||
"label": "ValidateContainers"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
"type": "schema",
|
||||
"name": "schema_houdini_publish"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,23 +5,6 @@
|
|||
"collapsible": true,
|
||||
"is_file": true,
|
||||
"children": [
|
||||
{
|
||||
"type": "dict",
|
||||
"key": "entities_root",
|
||||
"label": "Entities root folder",
|
||||
"children": [
|
||||
{
|
||||
"type": "text",
|
||||
"key": "assets",
|
||||
"label": "Assets:"
|
||||
},
|
||||
{
|
||||
"type": "text",
|
||||
"key": "shots",
|
||||
"label": "Shots (includes Episodes & Sequences if any):"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "dict",
|
||||
"key": "entities_naming_pattern",
|
||||
|
|
|
|||
|
|
@ -308,6 +308,10 @@
|
|||
"type": "schema_template",
|
||||
"name": "template_workfile_options"
|
||||
},
|
||||
{
|
||||
"type": "schema",
|
||||
"name": "schema_templated_workfile_build"
|
||||
},
|
||||
{
|
||||
"type": "schema",
|
||||
"name": "schema_publish_gui_filter"
|
||||
|
|
|
|||
|
|
@ -45,9 +45,15 @@
|
|||
"label": "Set color for publishable layers, set its resulting family and template for subset name. \nCan create flatten image from published instances.(Applicable only for remote publishing!)"
|
||||
},
|
||||
{
|
||||
"type": "boolean",
|
||||
"key": "create_flatten_image",
|
||||
"label": "Create flatten image"
|
||||
"label": "Create flatten image",
|
||||
"type": "enum",
|
||||
"multiselection": false,
|
||||
"enum_items": [
|
||||
{ "flatten_with_images": "Flatten with images" },
|
||||
{ "flatten_only": "Flatten only" },
|
||||
{ "no": "No" }
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "text",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,113 @@
|
|||
{
|
||||
"type": "dict",
|
||||
"collapsible": true,
|
||||
"key": "publish",
|
||||
"label": "Publish plugins",
|
||||
"children": [
|
||||
{
|
||||
"type": "label",
|
||||
"label": "Validators"
|
||||
},
|
||||
{
|
||||
"type": "schema_template",
|
||||
"name": "template_publish_plugin",
|
||||
"template_data": [
|
||||
{
|
||||
"key": "ValidateCameraZeroKeyframe",
|
||||
"label": "Validate Camera Zero Keyframe"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "collapsible-wrap",
|
||||
"label": "Model",
|
||||
"children": [
|
||||
{
|
||||
"type": "schema_template",
|
||||
"name": "template_publish_plugin",
|
||||
"template_data": [
|
||||
{
|
||||
"key": "ValidateMeshHasUvs",
|
||||
"label": "Validate Mesh Has UVs"
|
||||
},
|
||||
{
|
||||
"key": "ValidateMeshNoNegativeScale",
|
||||
"label": "Validate Mesh No Negative Scale"
|
||||
},
|
||||
{
|
||||
"key": "ValidateTransformZero",
|
||||
"label": "Validate Transform Zero"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "splitter"
|
||||
},
|
||||
{
|
||||
"type": "label",
|
||||
"label": "Extractors"
|
||||
},
|
||||
{
|
||||
"type": "dict",
|
||||
"collapsible": true,
|
||||
"key": "ExtractBlend",
|
||||
"label": "Extract Blend",
|
||||
"checkbox_key": "enabled",
|
||||
"children": [
|
||||
{
|
||||
"type": "boolean",
|
||||
"key": "enabled",
|
||||
"label": "Enabled"
|
||||
},
|
||||
{
|
||||
"type": "boolean",
|
||||
"key": "optional",
|
||||
"label": "Optional"
|
||||
},
|
||||
{
|
||||
"type": "boolean",
|
||||
"key": "active",
|
||||
"label": "Active"
|
||||
},
|
||||
{
|
||||
"key": "families",
|
||||
"label": "Families",
|
||||
"type": "list",
|
||||
"object_type": "text"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "schema_template",
|
||||
"name": "template_publish_plugin",
|
||||
"template_data": [
|
||||
{
|
||||
"key": "ExtractFBX",
|
||||
"label": "Extract FBX (model and rig)"
|
||||
},
|
||||
{
|
||||
"key": "ExtractABC",
|
||||
"label": "Extract ABC (model and pointcache)"
|
||||
},
|
||||
{
|
||||
"key": "ExtractBlendAnimation",
|
||||
"label": "Extract Animation as Blend"
|
||||
},
|
||||
{
|
||||
"key": "ExtractAnimationFBX",
|
||||
"label": "Extract Animation as FBX"
|
||||
},
|
||||
{
|
||||
"key": "ExtractCamera",
|
||||
"label": "Extract FBX Camera as FBX"
|
||||
},
|
||||
{
|
||||
"key": "ExtractLayout",
|
||||
"label": "Extract Layout as JSON"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
{
|
||||
"type": "dict",
|
||||
"collapsible": true,
|
||||
"key": "publish",
|
||||
"label": "Publish plugins",
|
||||
"children": [
|
||||
{
|
||||
"type": "dict",
|
||||
"collapsible": true,
|
||||
"checkbox_key": "enabled",
|
||||
"key": "ValidateWorkfilePaths",
|
||||
"label": "Validate Workfile Paths",
|
||||
"is_group": true,
|
||||
"children": [
|
||||
{
|
||||
"type": "boolean",
|
||||
"key": "enabled",
|
||||
"label": "Enabled"
|
||||
},
|
||||
{
|
||||
"type": "boolean",
|
||||
"key": "optional",
|
||||
"label": "Optional"
|
||||
},
|
||||
{
|
||||
"key": "node_types",
|
||||
"label": "Node types",
|
||||
"type": "list",
|
||||
"object_type": "text"
|
||||
},
|
||||
{
|
||||
"key": "prohibited_vars",
|
||||
"label": "Prohibited variables",
|
||||
"type": "list",
|
||||
"object_type": "text"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "schema_template",
|
||||
"name": "template_publish_plugin",
|
||||
"template_data": [
|
||||
{
|
||||
"key": "ValidateContainers",
|
||||
"label": "ValidateContainers"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -61,8 +61,8 @@
|
|||
"name": "template_publish_plugin",
|
||||
"template_data": [
|
||||
{
|
||||
"key": "ValidateInstanceInContext",
|
||||
"label": "Validate Instance In Context"
|
||||
"key": "ValidateCorrectAssetName",
|
||||
"label": "Validate Correct Asset name"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
"type": "task-types-enum"
|
||||
},
|
||||
{
|
||||
"key": "tasks",
|
||||
"key": "task_names",
|
||||
"label": "Task names",
|
||||
"type": "list",
|
||||
"object_type": "text"
|
||||
|
|
|
|||
|
|
@ -831,7 +831,10 @@ class MongoSettingsHandler(SettingsHandler):
|
|||
data_cache.update_last_saved_info(last_saved_info)
|
||||
|
||||
self._save_project_data(
|
||||
project_name, self._project_settings_key, data_cache
|
||||
project_name,
|
||||
self._project_settings_key,
|
||||
data_cache,
|
||||
last_saved_info
|
||||
)
|
||||
|
||||
def save_project_anatomy(self, project_name, anatomy_data):
|
||||
|
|
@ -849,8 +852,16 @@ class MongoSettingsHandler(SettingsHandler):
|
|||
self._save_project_anatomy_data(project_name, data_cache)
|
||||
|
||||
else:
|
||||
last_saved_info = SettingsStateInfo.create_new(
|
||||
self._current_version,
|
||||
PROJECT_ANATOMY_KEY,
|
||||
project_name
|
||||
)
|
||||
self._save_project_data(
|
||||
project_name, self._project_anatomy_key, data_cache
|
||||
project_name,
|
||||
self._project_anatomy_key,
|
||||
data_cache,
|
||||
last_saved_info
|
||||
)
|
||||
|
||||
@classmethod
|
||||
|
|
@ -931,14 +942,16 @@ class MongoSettingsHandler(SettingsHandler):
|
|||
{"$set": update_dict}
|
||||
)
|
||||
|
||||
def _save_project_data(self, project_name, doc_type, data_cache):
|
||||
def _save_project_data(
|
||||
self, project_name, doc_type, data_cache, last_saved_info
|
||||
):
|
||||
is_default = bool(project_name is None)
|
||||
query_filter = {
|
||||
"type": doc_type,
|
||||
"is_default": is_default,
|
||||
"version": self._current_version
|
||||
}
|
||||
last_saved_info = data_cache.last_saved_info
|
||||
|
||||
new_project_settings_doc = {
|
||||
"type": doc_type,
|
||||
"data": data_cache.data,
|
||||
|
|
@ -946,6 +959,7 @@ class MongoSettingsHandler(SettingsHandler):
|
|||
"version": self._current_version,
|
||||
"last_saved_info": last_saved_info.to_data()
|
||||
}
|
||||
|
||||
if not is_default:
|
||||
query_filter["project_name"] = project_name
|
||||
new_project_settings_doc["project_name"] = project_name
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue