Skip to content

Commit

Permalink
#6146: DragManipulator is using the tester implementation like the rest
Browse files Browse the repository at this point in the history
There's still a special handling needed for children of func_* entities that
have been selected by tabbing through a group entity.
  • Loading branch information
codereader committed Nov 1, 2022
1 parent 102b71a commit ffa3229
Showing 1 changed file with 2 additions and 14 deletions.
16 changes: 2 additions & 14 deletions radiantcore/selection/manipulators/DragManipulator.cpp
Expand Up @@ -68,20 +68,8 @@ void DragManipulator::testSelectPrimitiveMode(const VolumeTest& view, SelectionT
{
SingleItemSelector itemSelector;

// First try to select entities (including func_* groups)
EntitySelector selectionTester(itemSelector, test);
GlobalSceneGraph().foreachVisibleNodeInVolume(view, selectionTester);

if (itemSelector.hasValidSelectable())
{
// Found a selectable entity
selector.addSelectable(SelectionIntersection(0, 0), &_dragSelectable);
return;
}

// Find all worldspawn primitives
PrimitiveSelector primitiveTester(itemSelector, test);
GlobalSceneGraph().foreachVisibleNodeInVolume(view, primitiveTester);
auto tester = _testerFactory.createSceneSelectionTester(SelectionMode::Primitive);
tester->testSelectScene(view, test, itemSelector);

if (itemSelector.hasValidSelectable())
{
Expand Down

0 comments on commit ffa3229

Please sign in to comment.