From 996188864c19992758bc46ff4c47da1f85a080ff Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Wed, 2 Apr 2025 21:53:10 -0500
Subject: [PATCH] Select selected objects on unlock properties.

---
 Source/Editor/Windows/PropertiesWindow.cs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Source/Editor/Windows/PropertiesWindow.cs b/Source/Editor/Windows/PropertiesWindow.cs
index d10b1916f..3d339fd80 100644
--- a/Source/Editor/Windows/PropertiesWindow.cs
+++ b/Source/Editor/Windows/PropertiesWindow.cs
@@ -22,6 +22,7 @@ namespace FlaxEditor.Windows
         private IEnumerable<object> undoRecordObjects;
 
         private readonly Dictionary<Guid, float> _actorScrollValues = new Dictionary<Guid, float>();
+        private bool _lockObjects = false;
 
         /// <inheritdoc />
         public override bool UseLayoutData => true;
@@ -44,7 +45,18 @@ namespace FlaxEditor.Windows
         /// <summary>
         /// Indication of if the properties window is locked on specific objects.
         /// </summary>
-        public bool LockObjects = false;
+        public bool LockObjects
+        {
+            get => _lockObjects;
+            set
+            {
+                if (value == _lockObjects)
+                    return;
+                _lockObjects = value;
+                if (!value)
+                    OnSelectionChanged();
+            }
+        }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PropertiesWindow"/> class.