From 65723400ddb641f31223dace702e75f1f6589d89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?=
 <33513211+antirotor@users.noreply.github.com>
Date: Fri, 28 May 2021 18:18:22 +0200
Subject: [PATCH 1/2] fix validation types

---
 .../hosts/maya/plugins/publish/validate_rendersettings.py    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openpype/hosts/maya/plugins/publish/validate_rendersettings.py b/openpype/hosts/maya/plugins/publish/validate_rendersettings.py
index 9aeaad7ff1..8d2c7d8f63 100644
--- a/openpype/hosts/maya/plugins/publish/validate_rendersettings.py
+++ b/openpype/hosts/maya/plugins/publish/validate_rendersettings.py
@@ -243,7 +243,10 @@ class ValidateRenderSettings(pyblish.api.InstancePlugin):
                         "Cannot get value of {}.{}".format(
                             node, attribute_name))
                 else:
-                    if value != render_value:
+                    # compare values as strings to get around various
+                    # datatypes possible in Settings and Render
+                    # Settings
+                    if str(value) != str(render_value):
                         invalid = True
                         cls.log.error(
                             ("Invalid value {} set on {}.{}. "

From 7bb91258c442b5953b5467bafaabfc25d096d079 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?=
 <33513211+antirotor@users.noreply.github.com>
Date: Fri, 28 May 2021 18:21:22 +0200
Subject: [PATCH 2/2] fix beauty detection regex

---
 openpype/modules/deadline/plugins/publish/submit_publish_job.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py
index ea953441a2..7a4481c526 100644
--- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py
+++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py
@@ -105,7 +105,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
     families = ["render.farm", "prerender.farm",
                 "renderlayer", "imagesequence", "vrayscene"]
 
-    aov_filter = {"maya": [r".+(?:\.|_)([Bb]eauty)(?:\.|_).*"],
+    aov_filter = {"maya": [r".*(?:\.|_)?([Bb]eauty)(?:\.|_)?.*"],
                   "aftereffects": [r".*"],  # for everything from AE
                   "harmony": [r".*"],  # for everything from AE
                   "celaction": [r".*"]}