From 729af899723071b64b3fd4337c714a63d7977911 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 13 Apr 2021 15:35:10 +0200 Subject: [PATCH 1/9] removed applications from default settings --- .../defaults/project_anatomy/attributes.json | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/openpype/settings/defaults/project_anatomy/attributes.json b/openpype/settings/defaults/project_anatomy/attributes.json index 987021f25b..be271f4970 100644 --- a/openpype/settings/defaults/project_anatomy/attributes.json +++ b/openpype/settings/defaults/project_anatomy/attributes.json @@ -1,26 +1,14 @@ { "fps": 25.0, "frameStart": 1001, - "frameEnd": 1001, + "frameEnd": 1025, "clipIn": 1, - "clipOut": 1, + "clipOut": 25, "handleStart": 0, "handleEnd": 0, "resolutionWidth": 1920, "resolutionHeight": 1080, "pixelAspect": 1.0, - "applications": [ - "maya_2020", - "nuke_12-2", - "nukex_12-2", - "hiero_12-2", - "resolve_16", - "houdini_18-5", - "blender_2-90", - "harmony_20", - "photoshop_2021", - "aftereffects_2021", - "unreal_4-24" - ], + "applications": [], "tools_env": [] } \ No newline at end of file From 044139770efb288d011f5882b9db18e32ed04fd3 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 13 Apr 2021 15:35:36 +0200 Subject: [PATCH 2/9] added default ftrack intent template --- openpype/settings/defaults/project_settings/ftrack.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/settings/defaults/project_settings/ftrack.json b/openpype/settings/defaults/project_settings/ftrack.json index 03ac8f309f..37dfd767b8 100644 --- a/openpype/settings/defaults/project_settings/ftrack.json +++ b/openpype/settings/defaults/project_settings/ftrack.json @@ -195,7 +195,7 @@ "publish": { "IntegrateFtrackNote": { "enabled": true, - "note_with_intent_template": "", + "note_with_intent_template": "{intent}: {comment}", "note_labels": [] }, "ValidateFtrackAttributes": { From 64585cc2f162ac2a496b77c0a110dfab8336be11 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 13 Apr 2021 15:40:52 +0200 Subject: [PATCH 3/9] fix gamma ffmpeg argument --- openpype/settings/defaults/project_settings/global.json | 4 +++- .../defaults/project_settings/standalonepublisher.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/openpype/settings/defaults/project_settings/global.json b/openpype/settings/defaults/project_settings/global.json index 8081f92ef7..ca1b258e72 100644 --- a/openpype/settings/defaults/project_settings/global.json +++ b/openpype/settings/defaults/project_settings/global.json @@ -6,7 +6,9 @@ "ExtractJpegEXR": { "enabled": true, "ffmpeg_args": { - "input": [], + "input": [ + "-gamma 2.2" + ], "output": [] } }, diff --git a/openpype/settings/defaults/project_settings/standalonepublisher.json b/openpype/settings/defaults/project_settings/standalonepublisher.json index 08895bcba9..9d40d2ded6 100644 --- a/openpype/settings/defaults/project_settings/standalonepublisher.json +++ b/openpype/settings/defaults/project_settings/standalonepublisher.json @@ -116,7 +116,7 @@ "ExtractThumbnailSP": { "ffmpeg_args": { "input": [ - "gamma 2.2" + "-gamma 2.2" ], "output": [] } From 8b7f723b43a322153c9bddf64e0540ce17d6a4a8 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 13 Apr 2021 15:41:17 +0200 Subject: [PATCH 4/9] swap height and width resolution values --- openpype/settings/defaults/project_settings/maya.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json index feddd2860a..a524ec45ae 100644 --- a/openpype/settings/defaults/project_settings/maya.json +++ b/openpype/settings/defaults/project_settings/maya.json @@ -313,8 +313,8 @@ "rendererName": "vp2Renderer" }, "Resolution": { - "width": 1080, - "height": 1920, + "width": 1920, + "height": 1080, "percent": 1.0, "mode": "Custom" }, From 97dc30e7b719922aed0e6c10fcfdb50f47c25944 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 13 Apr 2021 15:42:00 +0200 Subject: [PATCH 5/9] fix path to maya startup script --- openpype/settings/defaults/system_settings/applications.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/settings/defaults/system_settings/applications.json b/openpype/settings/defaults/system_settings/applications.json index 8034bc6368..5a9493b31c 100644 --- a/openpype/settings/defaults/system_settings/applications.json +++ b/openpype/settings/defaults/system_settings/applications.json @@ -6,7 +6,7 @@ "host_name": "maya", "environment": { "PYTHONPATH": [ - "{OPENPYPE_ROOT}/pype/hosts/maya/startup", + "{OPENPYPE_ROOT}/openpype/hosts/maya/startup", "{OPENPYPE_ROOT}/repos/avalon-core/setup/maya", "{OPENPYPE_ROOT}/repos/maya-look-assigner", "{PYTHONPATH}" From 47c8444d09401aa5d522fb6adf9156a098fa355a Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 13 Apr 2021 15:52:19 +0200 Subject: [PATCH 6/9] removed CREATE_NEW_CONSOLE from blender's default --- openpype/settings/defaults/system_settings/applications.json | 1 - 1 file changed, 1 deletion(-) diff --git a/openpype/settings/defaults/system_settings/applications.json b/openpype/settings/defaults/system_settings/applications.json index 5a9493b31c..081a77ef52 100644 --- a/openpype/settings/defaults/system_settings/applications.json +++ b/openpype/settings/defaults/system_settings/applications.json @@ -715,7 +715,6 @@ "{OPENPYPE_ROOT}/repos/avalon-core/setup/blender", "{PYTHONPATH}" ], - "CREATE_NEW_CONSOLE": "yes" }, "variants": { "2-83": { From a7c0c70129205ab28568a2ad102af0cd32aaceb6 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 13 Apr 2021 15:52:36 +0200 Subject: [PATCH 7/9] added preffered qt binding --- openpype/settings/defaults/system_settings/applications.json | 1 + 1 file changed, 1 insertion(+) diff --git a/openpype/settings/defaults/system_settings/applications.json b/openpype/settings/defaults/system_settings/applications.json index 081a77ef52..bd2987c153 100644 --- a/openpype/settings/defaults/system_settings/applications.json +++ b/openpype/settings/defaults/system_settings/applications.json @@ -715,6 +715,7 @@ "{OPENPYPE_ROOT}/repos/avalon-core/setup/blender", "{PYTHONPATH}" ], + "QT_PREFERRED_BINDING": "PySide2" }, "variants": { "2-83": { From 05b05f0039417b34252e201a07c1d1757d9e54e4 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 13 Apr 2021 16:18:21 +0200 Subject: [PATCH 8/9] changed clip out and frame end back to previous value --- openpype/settings/defaults/project_anatomy/attributes.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/settings/defaults/project_anatomy/attributes.json b/openpype/settings/defaults/project_anatomy/attributes.json index be271f4970..1d16be42c5 100644 --- a/openpype/settings/defaults/project_anatomy/attributes.json +++ b/openpype/settings/defaults/project_anatomy/attributes.json @@ -1,9 +1,9 @@ { "fps": 25.0, "frameStart": 1001, - "frameEnd": 1025, + "frameEnd": 1001, "clipIn": 1, - "clipOut": 25, + "clipOut": 1, "handleStart": 0, "handleEnd": 0, "resolutionWidth": 1920, From e239c2bb0b580dd7bc9d4b69d62017e9fb2f3277 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 13 Apr 2021 18:49:32 +0200 Subject: [PATCH 9/9] added pre-set applications back to default --- .../defaults/project_anatomy/attributes.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/openpype/settings/defaults/project_anatomy/attributes.json b/openpype/settings/defaults/project_anatomy/attributes.json index 1d16be42c5..987021f25b 100644 --- a/openpype/settings/defaults/project_anatomy/attributes.json +++ b/openpype/settings/defaults/project_anatomy/attributes.json @@ -9,6 +9,18 @@ "resolutionWidth": 1920, "resolutionHeight": 1080, "pixelAspect": 1.0, - "applications": [], + "applications": [ + "maya_2020", + "nuke_12-2", + "nukex_12-2", + "hiero_12-2", + "resolve_16", + "houdini_18-5", + "blender_2-90", + "harmony_20", + "photoshop_2021", + "aftereffects_2021", + "unreal_4-24" + ], "tools_env": [] } \ No newline at end of file