Skip to content

Commit 369f604

Browse files
authored
Merge pull request o3de#17657 from aws-lumberyard-dev/daimini/SliceLevelUiRedCode/RemoveMenuItems
Slice Level UI Removal | Delete references to IsPrefabSystemEnabled, slice-related editor menu items
2 parents 5c3ffc9 + bd4749c commit 369f604

File tree

42 files changed

+324
-2604
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+324
-2604
lines changed

Code/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -344,18 +344,6 @@ namespace AzAssetBrowserRequestHandlerPrivate
344344
}
345345
}
346346

347-
bool isPrefabSystemEnabled = false;
348-
AzFramework::ApplicationRequests::Bus::BroadcastResult(
349-
isPrefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
350-
351-
if (!isPrefabSystemEnabled)
352-
{
353-
// Prepare undo command last so it captures the final state of the entity.
354-
EntityCreateCommand* command = aznew EntityCreateCommand(static_cast<AZ::u64>(newEntity->GetId()));
355-
command->Capture(newEntity);
356-
command->SetParent(undo.GetUndoBatch());
357-
}
358-
359347
ToolsApplicationRequests::Bus::Broadcast(&ToolsApplicationRequests::AddDirtyEntity, newEntity->GetId());
360348
createdEntities.push_back(newEntity->GetId());
361349
}

Code/Editor/Core/EditorActionsHandler.cpp

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
#include <Core/EditorActionsHandler.h>
1010

11-
#include <AzFramework/API/ApplicationAPI.h>
12-
1311
#include <AzToolsFramework/ActionManager/Action/ActionManagerInterface.h>
1412
#include <AzToolsFramework/ActionManager/Action/ActionManagerInternalInterface.h>
1513
#include <AzToolsFramework/ActionManager/HotKey/HotKeyManagerInterface.h>
@@ -236,15 +234,6 @@ void EditorActionsHandler::OnActionUpdaterRegistrationHook()
236234
m_actionManagerInterface->RegisterActionUpdater(EditorIdentifiers::RecentFilesChangedUpdaterIdentifier);
237235
m_actionManagerInterface->RegisterActionUpdater(EditorIdentifiers::UndoRedoUpdaterIdentifier);
238236
m_actionManagerInterface->RegisterActionUpdater(EditorIdentifiers::ViewportDisplayInfoStateChangedUpdaterIdentifier);
239-
240-
// If the Prefab system is not enabled, have a backup to update actions based on level loading.
241-
AzFramework::ApplicationRequests::Bus::BroadcastResult(
242-
m_isPrefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
243-
244-
if (!m_isPrefabSystemEnabled)
245-
{
246-
m_actionManagerInterface->RegisterActionUpdater(EditorIdentifiers::LevelLoadedUpdaterIdentifier);
247-
}
248237
}
249238

250239
void EditorActionsHandler::OnActionRegistrationHook()
@@ -2169,14 +2158,6 @@ void EditorActionsHandler::OnStopPlayInEditor()
21692158
);
21702159
}
21712160

2172-
void EditorActionsHandler::OnEntityStreamLoadSuccess()
2173-
{
2174-
if (!m_isPrefabSystemEnabled)
2175-
{
2176-
m_actionManagerInterface->TriggerActionUpdater(EditorIdentifiers::LevelLoadedUpdaterIdentifier);
2177-
}
2178-
}
2179-
21802161
void EditorActionsHandler::AfterEntitySelectionChanged(
21812162
[[maybe_unused]] const AzToolsFramework::EntityIdList& newlySelectedEntities,
21822163
[[maybe_unused]] const AzToolsFramework::EntityIdList& newlyDeselectedEntities)

Code/Editor/Core/EditorActionsHandler.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ class EditorActionsHandler
7373
// EditorEntityContextNotificationBus overrides ...
7474
void OnStartPlayInEditor() override;
7575
void OnStopPlayInEditor() override;
76-
void OnEntityStreamLoadSuccess() override;
7776

7877
// ToolsApplicationNotificationBus overrides ...
7978
void AfterEntitySelectionChanged(
@@ -135,6 +134,4 @@ class EditorActionsHandler
135134
AZStd::vector<AZStd::string> m_layoutMenuIdentifiers;
136135
AZStd::vector<AZStd::string> m_toolActionIdentifiers;
137136
AZStd::vector<AZStd::string> m_toolboxMacroActionIdentifiers;
138-
139-
bool m_isPrefabSystemEnabled = false;
140137
};

0 commit comments

Comments
 (0)