Merge branch 'develop' into enhancement/OP-7074_Validate-Render-Passes

server_addon/blender/server/settings/publish_plugins.py

@@ -44,6 +44,14 @@ class ExtractBlendModel(BaseSettingsModel):
         default_factory=list,
         title="Families"
     )
+    compress: bool = SettingsField(True, title="Compress")
+
+
+class ExtractBlendAnimationModel(BaseSettingsModel):
+    enabled: bool = SettingsField(True)
+    optional: bool = SettingsField(title="Optional")
+    active: bool = SettingsField(title="Active")
+    compress: bool = SettingsField(False, title="Compress")
 
 
 class ExtractPlayblastModel(BaseSettingsModel):
@@ -51,6 +59,7 @@ class ExtractPlayblastModel(BaseSettingsModel):
     optional: bool = SettingsField(title="Optional")
     active: bool = SettingsField(title="Active")
     presets: str = SettingsField("", title="Presets", widget="textarea")
+    compress: bool = SettingsField(False, title="Compress")
 
     @validator("presets")
     def validate_json(cls, value):
@@ -110,8 +119,8 @@ class PublishPuginsModel(BaseSettingsModel):
         default_factory=ValidatePluginModel,
         title="Extract ABC"
     )
-    ExtractBlendAnimation: ValidatePluginModel = SettingsField(
-        default_factory=ValidatePluginModel,
+    ExtractBlendAnimation: ExtractBlendAnimationModel = SettingsField(
+        default_factory=ExtractBlendAnimationModel,
         title="Extract Blend Animation"
     )
     ExtractAnimationFBX: ValidatePluginModel = SettingsField(
@@ -198,7 +207,8 @@ DEFAULT_BLENDER_PUBLISH_SETTINGS = {
             "action",
             "layout",
             "blendScene"
-        ]
+        ],
+        "compress": False
     },
     "ExtractFBX": {
         "enabled": False,
@@ -213,7 +223,8 @@ DEFAULT_BLENDER_PUBLISH_SETTINGS = {
     "ExtractBlendAnimation": {
         "enabled": True,
         "optional": True,
-        "active": True
+        "active": True,
+        "compress": False
     },
     "ExtractAnimationFBX": {
         "enabled": False,

server_addon/blender/server/version.py

@@ -1 +1 @@
-__version__ = "0.1.6"
+__version__ = "0.1.7"

server_addon/houdini/server/settings/publish.py

@@ -53,6 +53,9 @@ class PublishPluginsModel(BaseSettingsModel):
         default_factory=BasicValidateModel,
         title="Validate Latest Containers.",
         section="Validators")
+    ValidateInstanceInContextHoudini: BasicValidateModel = SettingsField(
+        default_factory=BasicValidateModel,
+        title="Validate Instance is in same Context.")
     ValidateMeshIsStatic: BasicValidateModel = SettingsField(
         default_factory=BasicValidateModel,
         title="Validate Mesh is Static.")
@@ -84,6 +87,11 @@ DEFAULT_HOUDINI_PUBLISH_SETTINGS = {
         "optional": True,
         "active": True
     },
+    "ValidateInstanceInContextHoudini": {
+        "enabled": True,
+        "optional": True,
+        "active": True
+    },
     "ValidateMeshIsStatic": {
         "enabled": True,
         "optional": True,

server_addon/houdini/server/version.py

@@ -1 +1 @@
-__version__ = "0.2.11"
+__version__ = "0.2.12"

server_addon/maya/server/settings/render_settings.py

@@ -355,7 +355,7 @@ class RedshiftSettingsModel(BaseSettingsModel):
     )
     additional_options: list[AdditionalOptionsModel] = SettingsField(
         default_factory=list,
-        title="Additional Vray Options",
+        title="Additional Redshift Options",
         description=(
             "Add additional options - put attribute and value, like "
             "reflectionMaxTraceDepth and 3"