From 7c41e3346fce0887975d5d09aa4bf123d45ab63f Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Tue, 16 Jan 2024 07:46:47 +0000 Subject: [PATCH 1/4] change label to be more reable. --- server_addon/maya/server/settings/render_settings.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/server_addon/maya/server/settings/render_settings.py b/server_addon/maya/server/settings/render_settings.py index b6163a04ce..75d0994759 100644 --- a/server_addon/maya/server/settings/render_settings.py +++ b/server_addon/maya/server/settings/render_settings.py @@ -298,6 +298,7 @@ class ArnoldSettingsModel(BaseSettingsModel): title="Additional Arnold Options", description=( "Add additional options - put attribute and value, like AASamples" + " and 4" ) ) @@ -325,8 +326,8 @@ class VraySettingsModel(BaseSettingsModel): default_factory=list, title="Additional Vray Options", description=( - "Add additional options - put attribute and value," - " like aaFilterSize" + "Add additional options - put attribute and value, like " + "aaFilterSize and 1.5" ) ) @@ -358,8 +359,8 @@ class RedshiftSettingsModel(BaseSettingsModel): default_factory=list, title="Additional Vray Options", description=( - "Add additional options - put attribute and value," - " like reflectionMaxTraceDepth" + "Add additional options - put attribute and value, like " + "reflectionMaxTraceDepth and 3" ) ) From 58978f55d8d54c79c25bbb7841e3692cb037692b Mon Sep 17 00:00:00 2001 From: Toke Stuart Jepsen Date: Wed, 17 Jan 2024 09:14:55 +0000 Subject: [PATCH 2/4] Increment version --- server_addon/maya/server/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server_addon/maya/server/version.py b/server_addon/maya/server/version.py index b87834cc35..684d830189 100644 --- a/server_addon/maya/server/version.py +++ b/server_addon/maya/server/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring addon version.""" -__version__ = "0.1.7" +__version__ = "0.1.8" From eacb3431e2e58c3b489a87cfb48b795338129724 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 27 Jan 2024 03:25:03 +0000 Subject: [PATCH 3/4] chore(): update bug report / version --- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index fd6999604a..039b42bff3 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -35,6 +35,7 @@ body: label: Version description: What version are you running? Look to OpenPype Tray options: + - 3.18.6-nightly.1 - 3.18.5 - 3.18.5-nightly.3 - 3.18.5-nightly.2 @@ -134,7 +135,6 @@ body: - 3.15.8 - 3.15.8-nightly.3 - 3.15.8-nightly.2 - - 3.15.8-nightly.1 validations: required: true - type: dropdown From 40f8578d793de90caf83fc7c565f7ec54c973dc3 Mon Sep 17 00:00:00 2001 From: farrizabalaga Date: Mon, 29 Jan 2024 17:28:35 -0700 Subject: [PATCH 4/4] Fix traypublisher asset/folderPath bug when updating instances --- openpype/hosts/traypublisher/api/plugin.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/openpype/hosts/traypublisher/api/plugin.py b/openpype/hosts/traypublisher/api/plugin.py index 14c66fa08f..6859b85a46 100644 --- a/openpype/hosts/traypublisher/api/plugin.py +++ b/openpype/hosts/traypublisher/api/plugin.py @@ -221,9 +221,16 @@ class SettingsCreator(TrayPublishCreator): ): filtered_instance_data.append(instance) - asset_names = { - instance["asset"] - for instance in filtered_instance_data} + if AYON_SERVER_ENABLED: + asset_names = { + instance["folderPath"] + for instance in filtered_instance_data + } + else: + asset_names = { + instance["asset"] + for instance in filtered_instance_data + } subset_names = { instance["subset"] for instance in filtered_instance_data} @@ -231,7 +238,10 @@ class SettingsCreator(TrayPublishCreator): asset_names, subset_names ) for instance in filtered_instance_data: - asset_name = instance["asset"] + if AYON_SERVER_ENABLED: + asset_name = instance["folderPath"] + else: + asset_name = instance["asset"] subset_name = instance["subset"] version = subset_docs_by_asset_id[asset_name][subset_name] instance["creator_attributes"]["version_to_use"] = version