Merge branch 'develop' into feature/blender-review

This commit is contained in:
Simone Barbieri 2023-03-14 10:04:49 +00:00 committed by GitHub
commit 6754e97490
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
962 changed files with 38669 additions and 14887 deletions

View file

@ -1,4 +1,14 @@
{
"imageio": {
"ocio_config": {
"enabled": false,
"filepath": []
},
"file_rules": {
"enabled": false,
"rules": {}
}
},
"create": {
"RenderCreator": {
"defaults": [
@ -23,4 +33,4 @@
"create_first_version": false,
"custom_templates": []
}
}
}

View file

@ -1,4 +1,14 @@
{
"imageio": {
"ocio_config": {
"enabled": false,
"filepath": []
},
"file_rules": {
"enabled": false,
"rules": {}
}
},
"workfile_builder": {
"create_first_version": false,
"custom_templates": []
@ -24,6 +34,11 @@
"optional": false,
"active": true
},
"ValidateNoColonsInName": {
"enabled": true,
"optional": false,
"active": true
},
"ExtractBlend": {
"enabled": true,
"optional": true,
@ -155,4 +170,4 @@
}
}
}
}
}

View file

@ -1,4 +1,14 @@
{
"imageio": {
"ocio_config": {
"enabled": false,
"filepath": []
},
"file_rules": {
"enabled": false,
"rules": {}
}
},
"publish": {
"CollectRenderPath": {
"output_extension": "png",
@ -6,4 +16,4 @@
"anatomy_template_key_metadata": "render"
}
}
}
}

View file

@ -25,6 +25,7 @@
"active": true,
"tile_assembler_plugin": "OpenPypeTileAssembler",
"use_published": true,
"import_reference": false,
"asset_dependencies": true,
"priority": 50,
"tile_priority": 50,
@ -32,13 +33,25 @@
"limit": [],
"jobInfo": {},
"pluginInfo": {},
"scene_patches": []
"scene_patches": [],
"strict_error_checking": true
},
"MaxSubmitDeadline": {
"enabled": true,
"optional": false,
"active": true,
"use_published": true,
"priority": 50,
"chunk_size": 10,
"group": "none",
"deadline_pool": "",
"deadline_pool_secondary": "",
"framePerTask": 1
},
"NukeSubmitDeadline": {
"enabled": true,
"optional": false,
"active": true,
"use_published": true,
"priority": 50,
"chunk_size": 10,
"concurrent_tasks": 1,
@ -101,8 +114,11 @@
],
"harmony": [
".*"
],
"max": [
".*"
]
}
}
}
}
}

View file

@ -1,5 +1,13 @@
{
"imageio": {
"ocio_config": {
"enabled": false,
"filepath": []
},
"file_rules": {
"enabled": false,
"rules": {}
},
"project": {
"colourPolicy": "ACES 1.1",
"frameDepth": "16-bit fp",
@ -106,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}>",
@ -135,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}>",
@ -155,4 +141,4 @@
]
}
}
}
}

View file

@ -324,7 +324,8 @@
"animation",
"look",
"rig",
"camera"
"camera",
"renderlayer"
],
"task_types": [],
"tasks": [],
@ -488,10 +489,11 @@
},
"keep_first_subset_name_for_review": true,
"asset_versions_status_profiles": [],
"additional_metadata_keys": []
"additional_metadata_keys": [],
"upload_reviewable_with_origin_name": false
},
"IntegrateFtrackFarmStatus": {
"farm_status_profiles": []
}
}
}
}

View file

@ -1,5 +1,13 @@
{
"imageio": {
"ocio_config": {
"enabled": false,
"filepath": []
},
"file_rules": {
"enabled": false,
"rules": {}
},
"ocio": {
"enabled": false,
"configFilePath": {
@ -9,4 +17,4 @@
}
}
}
}
}

View file

@ -1,4 +1,22 @@
{
"imageio": {
"ocio_config": {
"filepath": [
"{OPENPYPE_ROOT}/vendor/bin/ocioconfig/OpenColorIOConfigs/aces_1.2/config.ocio",
"{OPENPYPE_ROOT}/vendor/bin/ocioconfig/OpenColorIOConfigs/nuke-default/config.ocio"
]
},
"file_rules": {
"enabled": false,
"rules": {
"example": {
"pattern": ".*(beauty).*",
"colorspace": "ACES - ACEScg",
"ext": "exr"
}
}
}
},
"publish": {
"CollectAnatomyInstanceData": {
"follow_workfile_version": false
@ -50,6 +68,10 @@
"output": []
}
},
"ExtractOIIOTranscode": {
"enabled": true,
"profiles": []
},
"ExtractReview": {
"enabled": true,
"profiles": [
@ -117,7 +139,8 @@
"ext": "mp4",
"tags": [
"burnin",
"ftrackreview"
"ftrackreview",
"kitsureview"
],
"burnins": [],
"ffmpeg_args": {
@ -423,14 +446,14 @@
},
{
"families": [
"renderLocal"
"render"
],
"hosts": [
"aftereffects"
],
"task_types": [],
"tasks": [],
"template": "render{Task}{Variant}"
"template": "{family}{Task}{Composition}{Variant}"
},
{
"families": [
@ -502,8 +525,73 @@
]
},
"publish": {
"template_name_profiles": [],
"hero_template_name_profiles": []
"template_name_profiles": [
{
"families": [],
"hosts": [],
"task_types": [],
"task_names": [],
"template_name": "publish"
},
{
"families": [
"review",
"render",
"prerender"
],
"hosts": [],
"task_types": [],
"task_names": [],
"template_name": "render"
},
{
"families": [
"simpleUnrealTexture"
],
"hosts": [
"standalonepublisher"
],
"task_types": [],
"task_names": [],
"template_name": "simpleUnrealTexture"
},
{
"families": [
"staticMesh",
"skeletalMesh"
],
"hosts": [
"maya"
],
"task_types": [],
"task_names": [],
"template_name": "maya2unreal"
},
{
"families": [
"online"
],
"hosts": [
"traypublisher"
],
"task_types": [],
"task_names": [],
"template_name": "online"
}
],
"hero_template_name_profiles": [
{
"families": [
"simpleUnrealTexture"
],
"hosts": [
"standalonepublisher"
],
"task_types": [],
"task_names": [],
"template_name": "simpleUnrealTextureHero"
}
]
}
},
"project_folder_structure": "{\"__project_root__\": {\"prod\": {}, \"resources\": {\"footage\": {\"plates\": {}, \"offline\": {}}, \"audio\": {}, \"art_dept\": {}}, \"editorial\": {}, \"assets\": {\"characters\": {}, \"locations\": {}}, \"shots\": {}}}",
@ -524,4 +612,4 @@
"linux": []
},
"project_environments": {}
}
}

View file

@ -1,4 +1,14 @@
{
"imageio": {
"ocio_config": {
"enabled": false,
"filepath": []
},
"file_rules": {
"enabled": false,
"rules": {}
}
},
"load": {
"ImageSequenceLoader": {
"family": [
@ -40,4 +50,4 @@
"skip_timelines_check": []
}
}
}
}

View file

@ -1,5 +1,13 @@
{
"imageio": {
"ocio_config": {
"enabled": false,
"filepath": []
},
"file_rules": {
"enabled": false,
"rules": {}
},
"workfile": {
"ocioConfigName": "nuke-default",
"ocioconfigpath": {
@ -52,16 +60,6 @@
"render",
"review"
],
"representations": [
"exr",
"dpx",
"jpg",
"jpeg",
"png",
"h264",
"mov",
"mp4"
],
"clip_name_template": "{asset}_{subset}_{representation}"
}
},
@ -89,4 +87,4 @@
}
]
}
}
}

View file

@ -1,4 +1,14 @@
{
"imageio": {
"ocio_config": {
"enabled": false,
"filepath": []
},
"file_rules": {
"enabled": false,
"rules": {}
}
},
"shelves": [],
"create": {
"CreateArnoldAss": {
@ -66,4 +76,4 @@
"active": true
}
}
}
}

View file

@ -10,4 +10,4 @@
"note_status_shortname": "wfa"
}
}
}
}

View file

@ -0,0 +1,8 @@
{
"RenderSettings": {
"default_render_image_folder": "renders/3dsmax",
"aov_separator": "underscore",
"image_format": "exr",
"multipass": true
}
}

View file

@ -1,5 +1,14 @@
{
"open_workfile_post_initialization": false,
"imageio": {
"ocio_config": {
"enabled": false,
"filepath": []
},
"file_rules": {
"enabled": false,
"rules": {}
},
"colorManagementPreference_v2": {
"enabled": true,
"configFilePath": {
@ -85,6 +94,16 @@
"force_combine": true,
"aov_list": [],
"additional_options": []
},
"renderman_renderer": {
"image_prefix": "<layer>{aov_separator}<aov>.<f4>.<ext>",
"image_dir": "<scene>/<layer>",
"display_filters": [],
"imageDisplay_dir": "<imagedir>/<layer>{aov_separator}imageDisplayFilter.<f4>.<ext>",
"sample_filters": [],
"cryptomatte_dir": "<imagedir>/<layer>{aov_separator}cryptomatte.<f4>.<ext>",
"watermark_dir": "<imagedir>/<layer>{aov_separator}watermarkFilter.<f4>.<ext>",
"additional_options": []
}
},
"create": {
@ -128,6 +147,7 @@
"enabled": true,
"write_color_sets": false,
"write_face_sets": false,
"include_user_defined_attributes": false,
"defaults": [
"Main"
]
@ -146,6 +166,7 @@
"enabled": true,
"write_color_sets": false,
"write_face_sets": false,
"include_user_defined_attributes": false,
"defaults": [
"Main"
]
@ -158,6 +179,41 @@
"Main"
]
},
"CreateReview": {
"enabled": true,
"defaults": [
"Main"
],
"useMayaTimeline": true
},
"CreateAss": {
"enabled": true,
"defaults": [
"Main"
],
"expandProcedurals": false,
"motionBlur": true,
"motionBlurKeys": 2,
"motionBlurLength": 0.5,
"maskOptions": false,
"maskCamera": false,
"maskLight": false,
"maskShape": false,
"maskShader": false,
"maskOverride": false,
"maskDriver": false,
"maskFilter": false,
"maskColor_manager": false,
"maskOperator": false
},
"CreateVrayProxy": {
"enabled": true,
"vrmesh": true,
"alembic": true,
"defaults": [
"Main"
]
},
"CreateMultiverseUsd": {
"enabled": true,
"defaults": [
@ -176,26 +232,6 @@
"Main"
]
},
"CreateAss": {
"enabled": true,
"defaults": [
"Main"
],
"expandProcedurals": false,
"motionBlur": true,
"motionBlurKeys": 2,
"motionBlurLength": 0.5,
"maskOptions": false,
"maskCamera": false,
"maskLight": false,
"maskShape": false,
"maskShader": false,
"maskOverride": false,
"maskDriver": false,
"maskFilter": false,
"maskColor_manager": false,
"maskOperator": false
},
"CreateAssembly": {
"enabled": true,
"defaults": [
@ -226,12 +262,6 @@
"Main"
]
},
"CreateReview": {
"enabled": true,
"defaults": [
"Main"
]
},
"CreateRig": {
"enabled": true,
"defaults": [
@ -247,12 +277,6 @@
"Anim"
]
},
"CreateVrayProxy": {
"enabled": true,
"defaults": [
"Main"
]
},
"CreateVRayScene": {
"enabled": true,
"defaults": [
@ -306,6 +330,11 @@
"optional": true,
"active": true
},
"ValidateMayaColorSpace": {
"enabled": true,
"optional": true,
"active": true
},
"ValidateAttributes": {
"enabled": false,
"attributes": {}
@ -338,6 +367,45 @@
"rig"
]
},
"ValidatePluginPathAttributes": {
"enabled": true,
"optional": false,
"active": true,
"attribute": {
"AlembicNode": "abc_File",
"VRayProxy": "fileName",
"RenderManArchive": "filename",
"pgYetiMaya": "cacheFileName",
"aiStandIn": "dso",
"RedshiftSprite": "tex0",
"RedshiftBokeh": "dofBokehImage",
"RedshiftCameraMap": "tex0",
"RedshiftEnvironment": "tex2",
"RedshiftDomeLight": "tex1",
"RedshiftIESLight": "profile",
"RedshiftLightGobo": "tex0",
"RedshiftNormalMap": "tex0",
"RedshiftProxyMesh": "fileName",
"RedshiftVolumeShape": "fileName",
"VRayTexGLSL": "fileName",
"VRayMtlGLSL": "fileName",
"VRayVRmatMtl": "fileName",
"VRayPtex": "ptexFile",
"VRayLightIESShape": "iesFile",
"VRayMesh": "materialAssignmentsFile",
"VRayMtlOSL": "fileName",
"VRayTexOSL": "fileName",
"VRayTexOCIO": "ocioConfigFile",
"VRaySettingsNode": "pmap_autoSaveFile2",
"VRayScannedMtl": "file",
"VRayScene": "parameterOverrideFilePath",
"VRayMtlMDL": "filename",
"VRaySimbiont": "file",
"dlOpenVDBShape": "filename",
"pgYetiMayaShape": "liveABCFilename",
"gpuCache": "cacheFileName"
}
},
"ValidateRenderSettings": {
"arnold_render_attributes": [],
"vray_render_attributes": [],
@ -349,6 +417,16 @@
"optional": false,
"active": true
},
"ValidateGLSLMaterial": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateGLSLPlugin": {
"enabled": true,
"optional": false,
"active": true
},
"ValidateRenderImageRule": {
"enabled": true,
"optional": false,
@ -606,7 +684,7 @@
"families": [
"pointcache",
"model",
"vrayproxy"
"vrayproxy.alembic"
]
},
"ExtractObj": {
@ -757,6 +835,11 @@
"twoSidedLighting": true,
"lineAAEnable": true,
"multiSample": 8,
"useDefaultMaterial": false,
"wireframeOnShaded": false,
"xray": false,
"jointXray": false,
"backfaceCulling": false,
"ssaoEnable": false,
"ssaoAmount": 1,
"ssaoRadius": 16,
@ -835,6 +918,11 @@
"optional": true,
"active": true,
"bake_attributes": []
},
"ExtractGLB": {
"enabled": true,
"active": true,
"ogsfx_path": "/maya2glTF/PBR/shaders/glTF_PBR.ogsfx"
}
},
"load": {

View file

@ -1,7 +1,7 @@
{
"general": {
"menu": {
"create": "ctrl+shift+alt+c",
"create": "ctrl+alt+c",
"publish": "ctrl+alt+p",
"load": "ctrl+alt+l",
"manage": "ctrl+alt+m",
@ -9,7 +9,14 @@
}
},
"imageio": {
"enabled": false,
"ocio_config": {
"enabled": false,
"filepath": []
},
"file_rules": {
"enabled": false,
"rules": {}
},
"viewer": {
"viewerProcess": "sRGB"
},
@ -239,6 +246,7 @@
"sourcetype": "python",
"title": "Gizmo Note",
"command": "nuke.nodes.StickyNote(label='You can create your own toolbar menu in the Nuke GizmoMenu of OpenPype')",
"icon": "",
"shortcut": ""
}
]
@ -248,12 +256,15 @@
],
"create": {
"CreateWriteRender": {
"fpath_template": "{work}/renders/nuke/{subset}/{subset}.{frame}.{ext}",
"defaults": [
"temp_rendering_path_template": "{work}/renders/nuke/{subset}/{subset}.{frame}.{ext}",
"default_variants": [
"Main",
"Mask"
],
"knobs": [],
"instance_attributes": [
"reviewable",
"farm_rendering"
],
"prenodes": {
"Reformat01": {
"nodeclass": "Reformat",
@ -274,37 +285,39 @@
}
},
"CreateWritePrerender": {
"fpath_template": "{work}/renders/nuke/{subset}/{subset}.{frame}.{ext}",
"use_range_limit": true,
"defaults": [
"temp_rendering_path_template": "{work}/renders/nuke/{subset}/{subset}.{frame}.{ext}",
"default_variants": [
"Key01",
"Bg01",
"Fg01",
"Branch01",
"Part01"
],
"reviewable": false,
"knobs": [],
"instance_attributes": [
"farm_rendering",
"use_range_limit"
],
"prenodes": {}
},
"CreateWriteStill": {
"fpath_template": "{work}/renders/nuke/{subset}/{subset}.{ext}",
"defaults": [
"ImageFrame",
"CreateWriteImage": {
"temp_rendering_path_template": "{work}/renders/nuke/{subset}/{subset}.{ext}",
"default_variants": [
"StillFrame",
"MPFrame",
"LayoutFrame"
],
"knobs": [],
"instance_attributes": [
"use_range_limit"
],
"prenodes": {
"FrameHold01": {
"nodeclass": "FrameHold",
"dependent": "",
"knobs": [
{
"type": "formatable",
"type": "expression",
"name": "first_frame",
"template": "{frame}",
"to_type": "number"
"expression": "parent.first"
}
]
}
@ -312,7 +325,7 @@
}
},
"publish": {
"PreCollectNukeInstances": {
"CollectInstanceData": {
"sync_workfile_version_on_families": [
"nukenodes",
"camera",
@ -433,6 +446,41 @@
"value": false
}
],
"reformat_nodes_config": {
"enabled": false,
"reposition_nodes": [
{
"node_class": "Reformat",
"knobs": [
{
"type": "text",
"name": "type",
"value": "to format"
},
{
"type": "text",
"name": "format",
"value": "HD_1080"
},
{
"type": "text",
"name": "filter",
"value": "Lanczos6"
},
{
"type": "bool",
"name": "black_outside",
"value": true
},
{
"type": "bool",
"name": "pbb",
"value": false
}
]
}
]
},
"extension": "mov",
"add_custom_tags": []
}
@ -517,7 +565,17 @@
]
},
"templated_workfile_build": {
"profiles": []
"profiles": [
{
"task_types": [
"Compositing"
],
"task_names": [],
"path": "{project[name]}/templates/comp.nk",
"keep_placeholder": true,
"create_first_version": true
}
]
},
"filters": {}
}
}

View file

@ -1,4 +1,14 @@
{
"imageio": {
"ocio_config": {
"enabled": false,
"filepath": []
},
"file_rules": {
"enabled": false,
"rules": {}
}
},
"create": {
"CreateImage": {
"defaults": [
@ -57,4 +67,4 @@
"create_first_version": false,
"custom_templates": []
}
}
}

View file

@ -1,4 +1,14 @@
{
"imageio": {
"ocio_config": {
"enabled": false,
"filepath": []
},
"file_rules": {
"enabled": false,
"rules": {}
}
},
"create": {
"CreateShotClip": {
"hierarchy": "{folder}/{sequence}",
@ -17,4 +27,4 @@
"handleEnd": 10
}
}
}
}

View file

@ -4,4 +4,4 @@
"review": true
}
}
}
}

View file

@ -19,4 +19,4 @@
"step": "step"
}
}
}
}

View file

@ -17,4 +17,4 @@
]
}
}
}
}

View file

@ -1,4 +1,14 @@
{
"imageio": {
"ocio_config": {
"enabled": false,
"filepath": []
},
"file_rules": {
"enabled": false,
"rules": {}
}
},
"simple_creators": [
{
"family": "workfile",
@ -311,4 +321,4 @@
"active": true
}
}
}
}

View file

@ -1,9 +1,56 @@
{
"stop_timer_on_application_exit": false,
"publish": {
"CollectRenderScene": {
"imageio": {
"ocio_config": {
"enabled": false,
"render_layer": "Main"
"filepath": []
},
"file_rules": {
"enabled": false,
"rules": {}
}
},
"stop_timer_on_application_exit": false,
"create": {
"create_workfile": {
"enabled": true,
"default_variant": "Main",
"default_variants": []
},
"create_review": {
"enabled": true,
"active_on_create": true,
"default_variant": "Main",
"default_variants": []
},
"create_render_scene": {
"enabled": true,
"active_on_create": false,
"mark_for_review": true,
"default_pass_name": "beauty",
"default_variant": "Main",
"default_variants": []
},
"create_render_layer": {
"mark_for_review": false,
"default_pass_name": "beauty",
"default_variant": "Main",
"default_variants": []
},
"create_render_pass": {
"mark_for_review": false,
"default_variant": "Main",
"default_variants": []
},
"auto_detect_render": {
"allow_group_rename": true,
"group_name_template": "L{group_index}",
"group_idx_offset": 10,
"group_idx_padding": 3
}
},
"publish": {
"CollectRenderInstances": {
"ignore_render_pass_transparency": false
},
"ExtractSequence": {
"review_bg": [
@ -65,4 +112,4 @@
"custom_templates": []
},
"filters": {}
}
}

View file

@ -1,7 +1,17 @@
{
"imageio": {
"ocio_config": {
"enabled": false,
"filepath": []
},
"file_rules": {
"enabled": false,
"rules": {}
}
},
"level_sequences_for_layouts": false,
"delete_unmatched_assets": false,
"project_setup": {
"dev_mode": true
}
}
}

View file

@ -1,4 +1,14 @@
{
"imageio": {
"ocio_config": {
"enabled": false,
"filepath": []
},
"file_rules": {
"enabled": false,
"rules": {}
}
},
"timeout_profiles": [
{
"hosts": [
@ -131,4 +141,4 @@
"layer_name_regex": "(?P<layer>L[0-9]{3}_\\w+)_(?P<pass>.+)"
}
}
}
}