#6145: Restore the original selection when leaving focus mode.

codereader · Nov 4, 2022 · 4e1cf5c · 4e1cf5c
1 parent 7887e56
commit 4e1cf5c
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/radiantcore/selection/RadiantSelectionSystem.cpp b/radiantcore/selection/RadiantSelectionSystem.cpp
@@ -79,14 +79,24 @@ void RadiantSelectionSystem::toggleSelectionFocus()
     {
         rMessage() << "Leaving selection focus mode" << std::endl;
         _selectionFocusActive = false;
-        _selectionFocusPool.clear();
-
+
         GlobalSceneGraph().root()->foreachNode([&](const scene::INodePtr& node)
         {
             node->setRenderState(scene::INode::RenderState::Active);
             return true;
         });
 
+        // Re-select the pieces we had selected before entering
+        for (const auto& node : _selectionFocusPool)
+        {
+            // Nodes might have been removed in the meantime
+            if (node->inScene())
+            {
+                Node_setSelected(node, true);
+            }
+        }
+
+        _selectionFocusPool.clear();
         SceneChangeNotify();
         return;
     }