[Automated] Merged develop into main

.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

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

server_addon/maya/server/settings/render_settings.py

@@ -296,6 +296,7 @@ class ArnoldSettingsModel(BaseSettingsModel):
         title="Additional Arnold Options",
         description=(
             "Add additional options - put attribute and value, like AASamples"
+            " and 4"
         )
     )
 
@@ -323,8 +324,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"
         )
     )
 
@@ -356,8 +357,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"
         )
     )
 

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"