[LYN-3419] Removed remaining references to checking if the new viewport interaction model is enabled.

2021-04-29 16:45:39 -05:00
parent 54e06b0f63
commit 217ba1e816
18 changed files with 142 additions and 965 deletions
@@ -675,20 +675,8 @@ namespace AzToolsFramework
        // if the new viewport interaction model is enabled we do not want to
        // filter out locked entities as this breaks with the logic of being
        // able to select locked entities in the entity outliner
-        if (IsNewViewportInteractionModelEnabled())
-        {
-            selectedEntitiesFiltered.insert(
-                selectedEntitiesFiltered.begin(), selectedEntities.begin(), selectedEntities.end());
-        }
-        else
-        {
-            for (AZ::EntityId nowSelectedId : selectedEntities)
-            {
-                AZ_Assert(nowSelectedId.IsValid(), "Invalid entity Id being marked as selected.");
-
-                selectedEntitiesFiltered.push_back(nowSelectedId);
-            }
-        }
+        selectedEntitiesFiltered.insert(
+            selectedEntitiesFiltered.begin(), selectedEntities.begin(), selectedEntities.end());

        EntityIdList newlySelectedIds;
        EntityIdList newlyDeselectedIds;