From 8250502b7738f2bf109ce98eba6f2d53ff6b4620 Mon Sep 17 00:00:00 2001
From: Pratik Borhade <pratikborhade302@gmail.com>
Date: Fri, 9 Feb 2024 13:01:55 +0100
Subject: [PATCH] UI: Merge Spin and spin duplicate tools

Both tools calls the same operator, only difference is "dupli" bool
property value. So expose the property in tool settings and remove the
spin duplicate tool

Resolves #98094

Pull Request: https://projects.blender.org/blender/blender/pulls/117880
---
 .../icons/ops.mesh.spin.duplicate.dat         | Bin 4004 -> 0 bytes
 .../startup/bl_ui/space_toolsystem_toolbar.py |  23 ++----------------
 .../blender/editors/datafiles/CMakeLists.txt  |   1 -
 3 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 release/datafiles/icons/ops.mesh.spin.duplicate.dat

diff --git a/release/datafiles/icons/ops.mesh.spin.duplicate.dat b/release/datafiles/icons/ops.mesh.spin.duplicate.dat
deleted file mode 100644
index 4142b9fb4bef4f7e9e2a0cee76e96620da9c3805..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4004
zcmeH{Ur*W!7{>QST;jz@yim`@jK`!*VOmU4lrr3a2s&N;Utt-bp%<DMNy<i=F=7M*
z7pOsEbtJ&il>nU}flN04un7@J7D@C|c;0@AT`V+to{J~%`+Jh+ZAYFDJ$iU}^vKiY
zed_C6#n+YgkqxQ8+lM*_-MCZj8T^R3QD3LO+tcOm-h3v^dH(Tr+DBH@tN4m~38z#m
zYD%?=Z%8+v`MaHJ`v^T`A6Zw@L-deyP$0N*VBk(5ZAg76&``)wonEKak4lzMi;Q|T
zWth~@Dc-8BLpI%8d{I58A2m$s^oB{zgfOR5>qli&k4>`FW9zbt!Np6GrB_p$3B%-&
zO-5m68HHLfGiFx26$ol8Fsuq7y_(X`0c{SlIc-oE(C<okG$qTt3>#Q|R1sJ6inNx)
zkJM59u7TAC4XkEgnA7_8yRuAATEh3F|K$;IgqQFy!<u~qt4PZ-SVERTQ&<8^DB=P^
z%>#p1#POq-VSN;6QOKg6Z{Dmgzgl0vwcl?P{pY@GXU%=<yz|sP-ndJ?y#L(u&40f6
zLzwfN`11DqmAlpY%H2|(0;lS$^^M}@5C6II&VEn-w%@Pc(!c57&YD1Q-vZ;-38amp
z?;2>=kd;coQs8Dc#ivuJnV;b*dlNb1u2N^|68GciDtfb9WlO;-d%Z8rmHaomr<p`L
z#V6AL@f<kEr}&@Y>-{QwmOjno5~rDTDwoJ5&NzW^l>$cU3`jr2HxZykAd8kq%bJRg
zw`9y&+b^OzQJF26ik8B1*>p}`%~o{PiSlT5qV!srE5E4dvbN+hZ%Hm6S>o2@a@@*W
zei5bD)rrD#)|P*lwPnotclmb(lRzk1&PiYa=@(I%1=?)cbTvyhyAW!C8ZgVrezJc?
zN)60N2}lU!%~PV4Xq^#}&1AFrG1Wvhtv#lj>1IacLO`u9#MS!gDLBGN>3+I@O)hK^
zt>CR>Gc^Ee0(KJ(4K9T4rv}<l)wtLsHgy==7upwErp2a~X%Qr%@h4glF2Y-2q8;sc
zE|!X=z0c*S9337|je~I2xC(!v1s@-tmM_Q`dX2)C2nWa8QLzam1-4WU4XSbZg4oo?
zs6q&ba2;RTVr{XOFv7KjMUaR>PXeMX(N>GQjcH>#J|GUn(fa{oFlN}T3W2s%A=TE4
z0C;FPjK#26?-yZ9v<1G^#vmNX0c-~b4XO|pLpU<xDo{15X0DKBvOH6yYBNOw5~A=X
zOC*Wp%rO}uBj(T4A$7R+nU2sA=GavLC0zwq@>3SPz!d2+U0$mQTSO8(Nk*s|=n&Y4
zG&HyhbeXEL%teTUCvwcj*jO;kal!C5B-^1tVB5Rx4Z2x|Wg_o62j}?uKF8#kg8L!_
z@?L~4yq5v+P$8U)<ziotg{^HbxR+%(4&(r~BL@u^p<ImP4*D*~;>Nf!x_B^uFuyky
zH||aCK(aHot=UoTDEH(CeFuF}X<QPQoJjM1`M&S+%Q2Aha_mxhr2!xNK9!%(&z~#`
zTRTc{<w0NE2$BF>l81)NvHX18Xnr_+XsGcH8aL3mfj@Nv^?Lo`Z`YrCmyMprciXsu
Lzvl-2*8k%Fo7^jZ

diff --git a/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 4a97fa13400..b505acd4883 100644
--- a/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -803,6 +803,7 @@ class _defs_edit_mesh:
         def draw_settings(_context, layout, tool):
             props = tool.operator_properties("mesh.spin")
             layout.prop(props, "steps")
+            layout.prop(props, "dupli")
             props = tool.gizmo_group_properties("MESH_GGT_spin")
             layout.prop(props, "axis")
 
@@ -815,23 +816,6 @@ class _defs_edit_mesh:
             draw_settings=draw_settings,
         )
 
-    @ToolDef.from_fn
-    def spin_duplicate():
-        def draw_settings(_context, layout, tool):
-            props = tool.operator_properties("mesh.spin")
-            layout.prop(props, "steps")
-            props = tool.gizmo_group_properties("MESH_GGT_spin")
-            layout.prop(props, "axis")
-
-        return dict(
-            idname="builtin.spin_duplicates",
-            label="Spin Duplicates",
-            icon="ops.mesh.spin.duplicate",
-            widget="MESH_GGT_spin",
-            keymap=(),
-            draw_settings=draw_settings,
-        )
-
     @ToolDef.from_fn
     def inset():
         def draw_settings(_context, layout, tool):
@@ -2996,10 +2980,7 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
                 _defs_edit_mesh.bisect,
             ),
             _defs_edit_mesh.poly_build,
-            (
-                _defs_edit_mesh.spin,
-                _defs_edit_mesh.spin_duplicate,
-            ),
+            _defs_edit_mesh.spin,
             (
                 _defs_edit_mesh.vertex_smooth,
                 _defs_edit_mesh.vertex_randomize,
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index aaf873be126..6846dbb07f2 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -855,7 +855,6 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
   ops.mesh.rip
   ops.mesh.rip_edge
   ops.mesh.spin
-  ops.mesh.spin.duplicate
   ops.mesh.vertices_smooth
   ops.node.links_cut
   ops.paint.eyedropper_add