Merge branch 'develop' into release/3.13.x

This commit is contained in:
Milan Kolar 2022-07-22 08:13:52 +02:00
commit 799f0c8c2f
213 changed files with 7979 additions and 4366 deletions

View file

@ -98,7 +98,7 @@
],
"reel_group_name": "OpenPype_Reels",
"reel_name": "Loaded",
"clip_name_template": "{asset}_{subset}_{output}"
"clip_name_template": "{asset}_{subset}<_{output}>"
},
"LoadClipBatch": {
"enabled": true,
@ -121,7 +121,7 @@
"exr16fpdwaa"
],
"reel_name": "OP_LoadedReel",
"clip_name_template": "{asset}_{subset}_{output}"
"clip_name_template": "{asset}_{subset}<_{output}>"
}
}
}

View file

@ -124,6 +124,11 @@
"Project Manager"
],
"cycle_enabled": false,
"cycle_hour_start": [
0,
0,
0
],
"review_session_template": "{yy}{mm}{dd}"
}
},
@ -268,6 +273,49 @@
}
]
},
{
"hosts": [
"traypublisher"
],
"families": [],
"task_types": [],
"tasks": [],
"add_ftrack_family": true,
"advanced_filtering": []
},
{
"hosts": [
"traypublisher"
],
"families": [
"matchmove",
"shot"
],
"task_types": [],
"tasks": [],
"add_ftrack_family": false,
"advanced_filtering": []
},
{
"hosts": [
"traypublisher"
],
"families": [
"plate"
],
"task_types": [],
"tasks": [],
"add_ftrack_family": false,
"advanced_filtering": [
{
"families": [
"clip",
"review"
],
"add_ftrack_family": true
}
]
},
{
"hosts": [
"maya"

View file

@ -1,4 +1,20 @@
{
"load": {
"ImageSequenceLoader": {
"family": [
"shot",
"render",
"image",
"plate",
"reference"
],
"representations": [
"jpeg",
"png",
"jpg"
]
}
},
"publish": {
"CollectPalettes": {
"allowed_tasks": [

View file

@ -51,5 +51,17 @@
]
}
},
"filters": {}
"filters": {},
"scriptsmenu": {
"name": "OpenPype Tools",
"definition": [
{
"type": "action",
"sourcetype": "python",
"title": "OpenPype Docs",
"command": "import webbrowser;webbrowser.open(url='https://openpype.io/docs/artist_hosts_hiero')",
"tooltip": "Open the OpenPype Hiero user doc page"
}
]
}
}

View file

@ -204,10 +204,16 @@
"ValidateFrameRange": {
"enabled": true,
"optional": true,
"active": true
"active": true,
"exclude_families": [
"model",
"rig",
"staticMesh"
]
},
"ValidateShaderName": {
"enabled": false,
"optional": true,
"regex": "(?P<asset>.*)_(.*)_SHD"
},
"ValidateShadingEngine": {
@ -221,6 +227,7 @@
},
"ValidateLoadedPlugin": {
"enabled": false,
"optional": true,
"whitelist_native_plugins": false,
"authorized_plugins": []
},
@ -235,6 +242,7 @@
},
"ValidateUnrealStaticMeshName": {
"enabled": true,
"optional": true,
"validate_mesh": false,
"validate_collision": true
},
@ -251,6 +259,81 @@
"redshift_render_attributes": [],
"renderman_render_attributes": []
},
"ValidateCurrentRenderLayerIsRenderable": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateRenderImageRule": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateRenderNoDefaultCameras": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateRenderSingleCamera": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateRenderLayerAOVs": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateStepSize": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateVRayDistributedRendering": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateVrayReferencedAOVs": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateVRayTranslatorEnabled": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateVrayProxy": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateVrayProxyMembers": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateYetiRenderScriptCallbacks": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateYetiRigCacheState": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateYetiRigInputShapesInInstance": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateYetiRigSettings": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateModelName": {
"enabled": false,
"database": true,
@ -269,6 +352,7 @@
},
"ValidateTransformNamingSuffix": {
"enabled": true,
"optional": true,
"SUFFIX_NAMING_TABLE": {
"mesh": [
"_GEO",
@ -292,7 +376,7 @@
"ALLOW_IF_NOT_IN_SUFFIX_TABLE": true
},
"ValidateColorSets": {
"enabled": false,
"enabled": true,
"optional": true,
"active": true
},
@ -336,6 +420,16 @@
"optional": true,
"active": true
},
"ValidateMeshNoNegativeScale": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateMeshNonZeroEdgeLength": {
"enabled": true,
"optional": true,
"active": true
},
"ValidateMeshNormalsUnlocked": {
"enabled": false,
"optional": true,
@ -358,22 +452,22 @@
},
"ValidateNoNamespace": {
"enabled": true,
"optional": true,
"optional": false,
"active": true
},
"ValidateNoNullTransforms": {
"enabled": true,
"optional": true,
"optional": false,
"active": true
},
"ValidateNoUnknownNodes": {
"enabled": true,
"optional": true,
"optional": false,
"active": true
},
"ValidateNodeNoGhosting": {
"enabled": false,
"optional": true,
"optional": false,
"active": true
},
"ValidateShapeDefaultNames": {
@ -401,6 +495,21 @@
"optional": true,
"active": true
},
"ValidateNoVRayMesh": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateUnrealMeshTriangulated": {
"enabled": false,
"optional": true,
"active": true
},
"ValidateAlembicVisibleOnly": {
"enabled": true,
"optional": false,
"active": true
},
"ExtractAlembic": {
"enabled": true,
"families": [
@ -424,8 +533,34 @@
"optional": true,
"active": true
},
"ValidateAnimationContent": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateOutRelatedNodeIds": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateRigControllersArnoldAttributes": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateSkeletalMeshHierarchy": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateSkinclusterDeformerSet": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateRigOutSetNodeIds": {
"enabled": true,
"optional": false,
"allow_history_only": false
},
"ValidateCameraAttributes": {
@ -438,14 +573,44 @@
"optional": true,
"active": true
},
"ValidateAssemblyNamespaces": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateAssemblyModelTransforms": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateAssRelativePaths": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateInstancerContent": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateInstancerFrameRanges": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateNoDefaultCameras": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateUnrealUpAxis": {
"enabled": false,
"optional": true,
"active": true
},
"ValidateCameraContents": {
"enabled": true,
"optional": true,
"optional": false,
"validate_shapes": true
},
"ExtractPlayblast": {
@ -496,11 +661,29 @@
"override_viewport_options": true,
"displayLights": "default",
"textureMaxResolution": 1024,
"multiSample": 4,
"renderDepthOfField": true,
"shadows": true,
"textures": true,
"twoSidedLighting": true,
"ssaoEnable": true,
"lineAAEnable": true,
"multiSample": 8,
"ssaoEnable": false,
"ssaoAmount": 1,
"ssaoRadius": 16,
"ssaoFilterRadius": 16,
"ssaoSamples": 16,
"fogging": false,
"hwFogFalloff": "0",
"hwFogDensity": 0.0,
"hwFogStart": 0,
"hwFogEnd": 100,
"hwFogAlpha": 0,
"hwFogColorR": 1.0,
"hwFogColorG": 1.0,
"hwFogColorB": 1.0,
"motionBlurEnable": false,
"motionBlurSampleCount": 8,
"motionBlurShutterOpenFraction": 0.2,
"cameras": false,
"clipGhosts": false,
"controlVertices": false,

View file

@ -287,7 +287,11 @@
"LoadClip": {
"enabled": true,
"_representations": [],
"node_name_template": "{class_name}_{ext}"
"node_name_template": "{class_name}_{ext}",
"options_defaults": {
"start_at_workfile": true,
"add_retime": true
}
}
},
"workfile_builder": {

View file

@ -8,9 +8,10 @@
"default_variants": [
"Main"
],
"description": "Publish workfile backup",
"detailed_description": "",
"allow_sequences": true,
"description": "Backup of a working scene",
"detailed_description": "Workfiles are full scenes from any application that are directly edited by artists. They represent a state of work on a task at a given point and are usually not directly referenced into other scenes.",
"allow_sequences": false,
"allow_multiple_items": false,
"extensions": [
".ma",
".mb",
@ -30,6 +31,216 @@
".psb",
".aep"
]
},
{
"family": "model",
"identifier": "",
"label": "Model",
"icon": "fa.cubes",
"default_variants": [
"Main",
"Proxy",
"Sculpt"
],
"description": "Clean models",
"detailed_description": "Models should only contain geometry data, without any extras like cameras, locators or bones.\n\nKeep in mind that models published from tray publisher are not validated for correctness. ",
"allow_sequences": false,
"allow_multiple_items": true,
"extensions": [
".ma",
".mb",
".obj",
".abc",
".fbx",
".bgeo",
".bgeogz",
".bgeosc",
".usd",
".blend"
]
},
{
"family": "pointcache",
"identifier": "",
"label": "Pointcache",
"icon": "fa.gears",
"default_variants": [
"Main"
],
"description": "Geometry Caches",
"detailed_description": "Alembic or bgeo cache of animated data",
"allow_sequences": true,
"allow_multiple_items": true,
"extensions": [
".abc",
".bgeo",
".bgeogz",
".bgeosc"
]
},
{
"family": "plate",
"identifier": "",
"label": "Plate",
"icon": "mdi.camera-image",
"default_variants": [
"Main",
"BG",
"Animatic",
"Reference",
"Offline"
],
"description": "Footage Plates",
"detailed_description": "Any type of image seqeuence coming from outside of the studio. Usually camera footage, but could also be animatics used for reference.",
"allow_sequences": true,
"allow_multiple_items": true,
"extensions": [
".exr",
".png",
".dpx",
".jpg",
".tiff",
".tif",
".mov",
".mp4",
".avi"
]
},
{
"family": "render",
"identifier": "",
"label": "Render",
"icon": "mdi.folder-multiple-image",
"default_variants": [],
"description": "Rendered images or video",
"detailed_description": "Sequence or single file renders",
"allow_sequences": true,
"allow_multiple_items": true,
"extensions": [
".exr",
".png",
".dpx",
".jpg",
".jpeg",
".tiff",
".tif",
".mov",
".mp4",
".avi"
]
},
{
"family": "camera",
"identifier": "",
"label": "Camera",
"icon": "fa.video-camera",
"default_variants": [],
"description": "3d Camera",
"detailed_description": "Ideally this should be only camera itself with baked animation, however, it can technically also include helper geometry.",
"allow_sequences": false,
"allow_multiple_items": true,
"extensions": [
".abc",
".ma",
".hip",
".blend",
".fbx",
".usd"
]
},
{
"family": "image",
"identifier": "",
"label": "Image",
"icon": "fa.image",
"default_variants": [
"Reference",
"Texture",
"Concept",
"Background"
],
"description": "Single image",
"detailed_description": "Any image data can be published as image family. References, textures, concept art, matte paints. This is a fallback 2d family for everything that doesn't fit more specific family.",
"allow_sequences": false,
"allow_multiple_items": true,
"extensions": [
".exr",
".jpg",
".jpeg",
".dpx",
".bmp",
".tif",
".tiff",
".png",
".psb",
".psd"
]
},
{
"family": "vdb",
"identifier": "",
"label": "VDB Volumes",
"icon": "fa.cloud",
"default_variants": [],
"description": "Sparse volumetric data",
"detailed_description": "Hierarchical data structure for the efficient storage and manipulation of sparse volumetric data discretized on three-dimensional grids",
"allow_sequences": true,
"allow_multiple_items": true,
"extensions": [
".vdb"
]
},
{
"family": "matchmove",
"identifier": "",
"label": "Matchmove",
"icon": "fa.empire",
"default_variants": [
"Camera",
"Object",
"Mocap"
],
"description": "Matchmoving script",
"detailed_description": "Script exported from matchmoving application to be later processed into a tracked camera with additional data",
"allow_sequences": false,
"allow_multiple_items": true,
"extensions": []
},
{
"family": "rig",
"identifier": "",
"label": "Rig",
"icon": "fa.wheelchair",
"default_variants": [],
"description": "CG rig file",
"detailed_description": "CG rigged character or prop. Rig should be clean of any extra data and directly loadable into it's respective application\t",
"allow_sequences": false,
"allow_multiple_items": false,
"extensions": [
".ma",
".blend",
".hip",
".hda"
]
},
{
"family": "simpleUnrealTexture",
"identifier": "",
"label": "Simple UE texture",
"icon": "fa.image",
"default_variants": [],
"description": "Simple Unreal Engine texture",
"detailed_description": "Texture files with Unreal Engine naming conventions",
"allow_sequences": false,
"allow_multiple_items": true,
"extensions": []
}
]
],
"BatchMovieCreator": {
"default_variants": ["Main"],
"default_tasks": ["Compositing"],
"extensions": [
".mov"
]
}
}

View file

@ -2,11 +2,7 @@
"studio_name": "Studio name",
"studio_code": "stu",
"admin_password": "",
"environment": {
"__environment_keys__": {
"global": []
}
},
"environment": {},
"log_to_server": true,
"disk_mapping": {
"windows": [],