From 765319ee25ed3909c96991b0ffa4c3ca6297988b Mon Sep 17 00:00:00 2001
From: Ari Vuollet <ari.vuollet@goat.moe>
Date: Wed, 26 Mar 2025 19:12:30 +0200
Subject: [PATCH] Release rubber band selection when viewport starts
 controlling the view

---
 Source/Editor/Viewport/MainEditorGizmoViewport.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Source/Editor/Viewport/MainEditorGizmoViewport.cs b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
index 9e7983145..dc36cdcd3 100644
--- a/Source/Editor/Viewport/MainEditorGizmoViewport.cs
+++ b/Source/Editor/Viewport/MainEditorGizmoViewport.cs
@@ -611,10 +611,18 @@ namespace FlaxEditor.Viewport
 
             // Don't allow rubber band selection when gizmo is controlling mouse, vertex painting mode, or cloth painting is enabled
             bool canStart = !(IsControllingMouse || IsRightMouseButtonDown || IsAltKeyDown) &&
-                            Gizmos?.Active is TransformGizmo && !Gizmos.Active.IsControllingMouse;
+                            Gizmos?.Active is TransformGizmo;
             _rubberBandSelector.TryCreateRubberBand(canStart, _viewMousePos);
         }
 
+        /// <inheritdoc />
+        protected override void OnControlMouseBegin(Window win)
+        {
+            _rubberBandSelector.ReleaseRubberBandSelection();
+
+            base.OnControlMouseBegin(win);
+        }
+
         /// <inheritdoc />
         protected override void OnLeftMouseButtonDown()
         {