From aea9716f717300abeb956d56d66d1830d62b0442 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Wed, 20 Mar 2024 17:23:38 +0100
Subject: [PATCH 1/2] Blender: Validate Transform Zero - improve validation
 report + add repair action

---
 .../publish/validate_transform_zero.py        | 54 +++++++++++++++----
 1 file changed, 44 insertions(+), 10 deletions(-)

diff --git a/client/ayon_core/hosts/blender/plugins/publish/validate_transform_zero.py b/client/ayon_core/hosts/blender/plugins/publish/validate_transform_zero.py
index 267eff47e4..4ca1a86de3 100644
--- a/client/ayon_core/hosts/blender/plugins/publish/validate_transform_zero.py
+++ b/client/ayon_core/hosts/blender/plugins/publish/validate_transform_zero.py
@@ -1,3 +1,4 @@
+import inspect
 from typing import List
 
 import mathutils
@@ -5,29 +6,26 @@
 
 import pyblish.api
 
+from ayon_core.hosts.blender.api import plugin
 import ayon_core.hosts.blender.api.action
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     OptionalPyblishPluginMixin,
-    PublishValidationError
+    PublishValidationError,
+    RepairAction
 )
 
 
 class ValidateTransformZero(pyblish.api.InstancePlugin,
                             OptionalPyblishPluginMixin):
-    """Transforms can't have any values
-
-    To solve this issue, try freezing the transforms. So long
-    as the transforms, rotation and scale values are zero,
-    you're all good.
-
-    """
+    """Transforms can't have any values"""
 
     order = ValidateContentsOrder
     hosts = ["blender"]
     families = ["model"]
     label = "Transform Zero"
-    actions = [ayon_core.hosts.blender.api.action.SelectInvalidAction]
+    actions = [ayon_core.hosts.blender.api.action.SelectInvalidAction,
+               RepairAction]
 
     _identity = mathutils.Matrix()
 
@@ -51,5 +49,41 @@ def process(self, instance):
             names = ", ".join(obj.name for obj in invalid)
             raise PublishValidationError(
                 "Objects found in instance which do not"
-                f" have transform set to zero: {names}"
+                f" have transform set to zero: {names}",
+                description=self.get_description()
             )
+
+    @classmethod
+    def repair(cls, instance):
+
+        invalid = cls.get_invalid(instance)
+        if not invalid:
+            return
+
+        context = plugin.create_blender_context(
+            active=invalid[0], selected=invalid
+        )
+        with bpy.context.temp_override(**context):
+            # TODO: Preferably this does allow custom pivot point locations
+            #  and if so, this should likely apply to the delta instead
+            #  using `bpy.ops.object.transforms_to_deltas(mode="ALL")`
+            bpy.ops.object.transform_apply(location=True,
+                                           rotation=True,
+                                           scale=True)
+
+    def get_description(self):
+        return inspect.cleandoc(
+            """## Transforms can't have any values.
+
+            The location, rotation and scale on the transform must be at
+            the default values. This also goes for the delta transforms.
+
+            To solve this issue, try freezing the transforms:
+            - `Object` > `Apply` > `All Transforms`
+
+            Using the Repair action directly will do the same.
+
+            So long as the transforms, rotation and scale values are zero,
+            you're all good.
+            """
+        )

From 5b0826a16da2678ca26581dc6df933593550bed4 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Sun, 24 Mar 2024 12:40:26 +0100
Subject: [PATCH 2/2] Fix repair when objects are not currently selected

---
 .../publish/validate_transform_zero.py        | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/client/ayon_core/hosts/blender/plugins/publish/validate_transform_zero.py b/client/ayon_core/hosts/blender/plugins/publish/validate_transform_zero.py
index 4ca1a86de3..465ec15d7b 100644
--- a/client/ayon_core/hosts/blender/plugins/publish/validate_transform_zero.py
+++ b/client/ayon_core/hosts/blender/plugins/publish/validate_transform_zero.py
@@ -6,7 +6,7 @@
 
 import pyblish.api
 
-from ayon_core.hosts.blender.api import plugin
+from ayon_core.hosts.blender.api import plugin, lib
 import ayon_core.hosts.blender.api.action
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
@@ -63,13 +63,18 @@ def repair(cls, instance):
         context = plugin.create_blender_context(
             active=invalid[0], selected=invalid
         )
-        with bpy.context.temp_override(**context):
-            # TODO: Preferably this does allow custom pivot point locations
-            #  and if so, this should likely apply to the delta instead
-            #  using `bpy.ops.object.transforms_to_deltas(mode="ALL")`
-            bpy.ops.object.transform_apply(location=True,
-                                           rotation=True,
-                                           scale=True)
+        with lib.maintained_selection():
+            with bpy.context.temp_override(**context):
+                plugin.deselect_all()
+                for obj in invalid:
+                    obj.select_set(True)
+
+                # TODO: Preferably this does allow custom pivot point locations
+                #  and if so, this should likely apply to the delta instead
+                #  using `bpy.ops.object.transforms_to_deltas(mode="ALL")`
+                bpy.ops.object.transform_apply(location=True,
+                                               rotation=True,
+                                               scale=True)
 
     def get_description(self):
         return inspect.cleandoc(