From 43202bfe57d5c7dd4900c0ff4b71839b4a0a33f3 Mon Sep 17 00:00:00 2001
From: Tristan Strathearn <hello+tristan@hugemenace.co>
Date: Thu, 2 Jun 2022 20:01:02 +1000
Subject: [PATCH] feat: add shift alt-mode to set_origin utility to undo faux
 origin translations

---
 replicate/circular_array.py |  2 +-
 utils/set_origin.py         | 43 +++++++++++++++++++++++++++++--------
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/replicate/circular_array.py b/replicate/circular_array.py
index f6d24f3..9d4f50c 100644
--- a/replicate/circular_array.py
+++ b/replicate/circular_array.py
@@ -298,7 +298,7 @@ def add_displace_tranform_modifiers(self):
 
         if not self.single_obj_mode:
             for index, axis in enumerate(['X', 'Y', 'Z']):
-                displace = self.reference_obj.modifiers.new("Translate {} — ND CA".format(axis), 'DISPLACE')
+                displace = self.reference_obj.modifiers.new("Translate {} — ND FO".format(axis), 'DISPLACE')
                 displace.direction = axis
                 displace.space = 'LOCAL'
                 displace.mid_level = 0
diff --git a/utils/set_origin.py b/utils/set_origin.py
index fce50ad..e11d725 100644
--- a/utils/set_origin.py
+++ b/utils/set_origin.py
@@ -27,7 +27,8 @@ class ND_OT_set_origin(bpy.types.Operator):
     bl_idname = "nd.set_origin"
     bl_label = "Set Origin"
     bl_description = """Set the origin of the active object to that of another
-ALT — Use faux origin translation (for origin-reliant geometry)"""
+ALT — Use faux origin translation (for origin-reliant geometry)
+SHIFT — Undo faux origin translation"""
     bl_options = {'UNDO'}
 
 
@@ -38,6 +39,8 @@ def poll(cls, context):
             reference_obj = a if a.name != context.active_object.name else b
 
             return reference_obj.type == 'MESH'
+        elif context.mode == 'OBJECT' and len(context.selected_objects) == 1 and context.active_object.type == 'MESH':
+            return True
 
 
     def execute(self, context):
@@ -57,20 +60,42 @@ def execute(self, context):
 
     
     def invoke(self, context, event):
-        if event.alt:
-            return self.execute(context)
+        if len(context.selected_objects) == 1:
+            if event.shift:
+                self.revert_faux_origin(context)
         else:
-            a, b = context.selected_objects
-            reference_obj = a if a.name != context.active_object.name else b
+            if event.alt:
+                return self.execute(context)
+            else:
+                a, b = context.selected_objects
+                reference_obj = a if a.name != context.active_object.name else b
+
+                mx = context.active_object.matrix_world
+                set_origin(reference_obj, mx)
+
+        return {'FINISHED'}
+
 
-            mx = context.active_object.matrix_world
-            set_origin(reference_obj, mx)
+    def revert_faux_origin(self, context):
+        location = context.active_object.location.copy()
 
-            return {'FINISHED'}
+        mods = [mod for mod in context.active_object.modifiers if mod.type == 'DISPLACE' and mod.name.endswith('— ND FO')]
+        print(mods)
+        for mod in mods:
+            if mod.direction == 'X':
+                location.x = mod.strength
+            elif mod.direction == 'Y':
+                location.y = mod.strength
+            elif mod.direction == 'Z':
+                location.z = mod.strength
+
+            context.active_object.modifiers.remove(mod)
+        
+        context.active_object.location = location
 
     
     def add_displace_modifier(self, reference_obj, axis, strength):
-        displace = reference_obj.modifiers.new("{} Axis Displace — ND".format(axis), 'DISPLACE')
+        displace = reference_obj.modifiers.new("Translate {} — ND FO".format(axis), 'DISPLACE')
         displace.direction = axis 
         displace.space = 'GLOBAL'
         displace.mid_level = 0