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 bugfix/OP-3022-Look-publishing-and-srgb-colorspace-in-Maya-2022

Browse source
This commit is contained in:
Ondřej Samohel 2023-03-03 16:38:05 +01:00 • committed by GitHub
commit d077ac5b5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
158 changed files with 2257 additions and 1083 deletions
Download patch file Download diff file Expand all files Collapse all files

2
openpype/settings/defaults/project_anatomy/templates.json
View file

@ -55,7 +55,7 @@
},
"source": {
"folder": "{root[work]}/{originalDirname}",
"file": "{originalBasename}<.{@frame}><_{udim}>.{ext}",
"file": "{originalBasename}.{ext}",
"path": "{@folder}/{@file}"
},
"__dynamic_keys_labels__": {

1
openpype/settings/defaults/project_settings/deadline.json
View file

@ -52,7 +52,6 @@
"enabled": true,
"optional": false,
"active": true,
"use_published": true,
"priority": 50,
"chunk_size": 10,
"concurrent_tasks": 1,

22
openpype/settings/defaults/project_settings/flame.json
View file

@ -114,17 +114,6 @@
"render",
"review"
],
"representations": [
"exr",
"dpx",
"jpg",
"jpeg",
"png",
"h264",
"mov",
"mp4",
"exr16fpdwaa"
],
"reel_group_name": "OpenPype_Reels",
"reel_name": "Loaded",
"clip_name_template": "{asset}_{subset}<_{output}>",
@ -143,17 +132,6 @@
"render",
"review"
],
"representations": [
"exr",
"dpx",
"jpg",
"jpeg",
"png",
"h264",
"mov",
"mp4",
"exr16fpdwaa"
],
"reel_name": "OP_LoadedReel",
"clip_name_template": "{batch}_{asset}_{subset}<_{output}>",
"layer_rename_template": "{asset}_{subset}<_{output}>",

10
openpype/settings/defaults/project_settings/hiero.json
View file

@ -60,16 +60,6 @@
"render",
"review"
],
"representations": [
"exr",
"dpx",
"jpg",
"jpeg",
"png",
"h264",
"mov",
"mp4"
],
"clip_name_template": "{asset}_{subset}_{representation}"
}
},

31
openpype/settings/defaults/project_settings/maya.json
View file

@ -147,6 +147,7 @@
"enabled": true,
"write_color_sets": false,
"write_face_sets": false,
"include_user_defined_attributes": false,
"defaults": [
"Main"
]
@ -165,6 +166,7 @@
"enabled": true,
"write_color_sets": false,
"write_face_sets": false,
"include_user_defined_attributes": false,
"defaults": [
"Main"
]
@ -177,6 +179,13 @@
"Main"
]
},
"CreateReview": {
"enabled": true,
"defaults": [
"Main"
],
"useMayaTimeline": true
},
"CreateAss": {
"enabled": true,
"defaults": [
@ -197,6 +206,14 @@
"maskColor_manager": false,
"maskOperator": false
},
"CreateVrayProxy": {
"enabled": true,
"vrmesh": true,
"alembic": true,
"defaults": [
"Main"
]
},
"CreateMultiverseUsd": {
"enabled": true,
"defaults": [
@ -245,12 +262,6 @@
"Main"
]
},
"CreateReview": {
"enabled": true,
"defaults": [
"Main"
]
},
"CreateRig": {
"enabled": true,
"defaults": [
@ -266,12 +277,6 @@
"Anim"
]
},
"CreateVrayProxy": {
"enabled": true,
"defaults": [
"Main"
]
},
"CreateVRayScene": {
"enabled": true,
"defaults": [
@ -679,7 +684,7 @@
"families": [
"pointcache",
"model",
"vrayproxy"
"vrayproxy.alembic"
]
},
"ExtractObj": {

5
openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
View file

@ -285,11 +285,6 @@
"key": "active",
"label": "Active"
},
{
"type": "boolean",
"key": "use_published",
"label": "Use Published scene"
},
{
"type": "splitter"
},

12
openpype/settings/entities/schemas/projects_schema/schema_project_flame.json
View file

@ -494,12 +494,6 @@
"label": "Families",
"object_type": "text"
},
{
"type": "list",
"key": "representations",
"label": "Representations",
"object_type": "text"
},
{
"type": "separator"
},
@ -552,12 +546,6 @@
"label": "Families",
"object_type": "text"
},
{
"type": "list",
"key": "representations",
"label": "Representations",
"object_type": "text"
},
{
"type": "separator"
},

8
openpype/settings/entities/schemas/projects_schema/schema_project_hiero.json
View file

@ -266,12 +266,6 @@
"label": "Families",
"object_type": "text"
},
{
"type": "list",
"key": "representations",
"label": "Representations",
"object_type": "text"
},
{
"type": "text",
"key": "clip_name_template",
@ -334,4 +328,4 @@
"name": "schema_scriptsmenu"
}
]
}
}

73
openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json
View file

@ -132,6 +132,11 @@
"key": "write_face_sets",
"label": "Write Face Sets"
},
{
"type": "boolean",
"key": "include_user_defined_attributes",
"label": "Include User Defined Attributes"
},
{
"type": "list",
"key": "defaults",
@ -192,6 +197,11 @@
"key": "write_face_sets",
"label": "Write Face Sets"
},
{
"type": "boolean",
"key": "include_user_defined_attributes",
"label": "Include User Defined Attributes"
},
{
"type": "list",
"key": "defaults",
@ -230,6 +240,31 @@
}
]
},
{
"type": "dict",
"collapsible": true,
"key": "CreateReview",
"label": "Create Review",
"checkbox_key": "enabled",
"children": [
{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
},
{
"type": "list",
"key": "defaults",
"label": "Default Subsets",
"object_type": "text"
},
{
"type": "boolean",
"key": "useMayaTimeline",
"label": "Use Maya Timeline for Frame Range."
}
]
},
{
"type": "dict",
"collapsible": true,
@ -322,6 +357,36 @@
}
]
},
{
"type": "dict",
"collapsible": true,
"key": "CreateVrayProxy",
"label": "Create VRay Proxy",
"checkbox_key": "enabled",
"children": [
{
"type": "boolean",
"key": "enabled",
"label": "Enabled"
},
{
"type": "boolean",
"key": "vrmesh",
"label": "VrMesh"
},
{
"type": "boolean",
"key": "alembic",
"label": "Alembic"
},
{
"type": "list",
"key": "defaults",
"label": "Default Subsets",
"object_type": "text"
}
]
},
{
"type": "schema_template",
"name": "template_create_plugin",
@ -358,10 +423,6 @@
"key": "CreateRenderSetup",
"label": "Create Render Setup"
},
{
"key": "CreateReview",
"label": "Create Review"
},
{
"key": "CreateRig",
"label": "Create Rig"
@ -370,10 +431,6 @@
"key": "CreateSetDress",
"label": "Create Set Dress"
},
{
"key": "CreateVrayProxy",
"label": "Create VRay Proxy"
},
{
"key": "CreateVRayScene",
"label": "Create VRay Scene"

39
openpype/settings/handlers.py
View file

@ -9,6 +9,7 @@ import six
import openpype.version
from openpype.client.mongo import OpenPypeMongoConnection
from openpype.client.entities import get_project_connection, get_project
from openpype.lib.pype_info import get_workstation_info
from .constants import (
GLOBAL_SETTINGS_KEY,
@ -235,6 +236,18 @@ class SettingsHandler(object):
"""
pass
@abstractmethod
def save_change_log(self, project_name, changes, settings_type):
"""Stores changes to settings to separate logging collection.
Args:
project_name(str, null): Project name for which overrides are
or None for global settings.
changes(dict): Data of project overrides with override metadata.
settings_type (str): system|project|anatomy
"""
pass
@abstractmethod
def get_studio_system_settings_overrides(self, return_version):
"""Studio overrides of system settings."""
@ -913,6 +926,32 @@ class MongoSettingsHandler(SettingsHandler):
return data
def save_change_log(self, project_name, changes, settings_type):
"""Log all settings changes to separate collection"""
if not changes:
return
if settings_type == "project" and not project_name:
project_name = "default"
host_info = get_workstation_info()
document = {
"local_id": host_info["local_id"],
"username": host_info["username"],
"hostname": host_info["hostname"],
"hostip": host_info["hostip"],
"system_name": host_info["system_name"],
"date_created": datetime.datetime.now(),
"project": project_name,
"settings_type": settings_type,
"changes": changes
}
collection_name = "settings_log"
collection = (self.settings_collection[self.database_name]
[collection_name])
collection.insert_one(document)
def _save_project_anatomy_data(self, project_name, data_cache):
# Create copy of data as they will be modified during save
new_data = data_cache.data_copy()

4
openpype/settings/lib.py
View file

@ -159,6 +159,7 @@ def save_studio_settings(data):
except SaveWarningExc as exc:
warnings.extend(exc.warnings)
_SETTINGS_HANDLER.save_change_log(None, changes, "system")
_SETTINGS_HANDLER.save_studio_settings(data)
if warnings:
raise SaveWarningExc(warnings)
@ -218,7 +219,7 @@ def save_project_settings(project_name, overrides):
)
except SaveWarningExc as exc:
warnings.extend(exc.warnings)
_SETTINGS_HANDLER.save_change_log(project_name, changes, "project")
_SETTINGS_HANDLER.save_project_settings(project_name, overrides)
if warnings:
@ -280,6 +281,7 @@ def save_project_anatomy(project_name, anatomy_data):
except SaveWarningExc as exc:
warnings.extend(exc.warnings)
_SETTINGS_HANDLER.save_change_log(project_name, changes, "anatomy")
_SETTINGS_HANDLER.save_project_anatomy(project_name, anatomy_data)
if warnings: