birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[LYN-3105] Removed legacy CEditTool class and all sub-classes.

Browse Source
This commit is contained in:
Chris Galvan
2021-04-21 13:57:16 -05:00
parent 2f9102f10a
commit 0efa1e7817
60 changed files with 15 additions and 6678 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin_precompiled.h
-1
View File
@@ -21,7 +21,6 @@
#include <ISerialize.h>
#include <CryName.h>
#include <EditorDefs.h>
#include <EditTool.h>
#include <Resource.h>
/////////////////////////////////////////////////////////////////////////////
Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp
-8
View File
@@ -320,14 +320,6 @@ void CComponentEntityObject::OnSelected()
// Invoked when selected via tools application, so we notify sandbox.
const bool wasSelected = IsSelected();
GetIEditor()->GetObjectManager()->SelectObject(this);
// If we get here and we're not already selected in sandbox land it means
// the selection started in AZ land and we need to clear any edit tool
// the user may have selected from the rollup bar
if (GetIEditor()->GetEditTool() && !wasSelected)
{
GetIEditor()->SetEditTool(nullptr);
}
}
}
Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h
+2
View File
@@ -24,6 +24,8 @@
#include <AzToolsFramework/ToolsComponents/EditorEntityIconComponentBus.h>
#include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
#include <QtViewPane.h>
#include "../Editor/Objects/EntityObject.h"
#include <LmbrCentral/Rendering/MeshComponentBus.h>
#include <LmbrCentral/Rendering/RenderBoundsBus.h>
Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
-5
View File
@@ -1383,11 +1383,6 @@ void SandboxIntegrationManager::SetShowCircularDependencyError(const bool& showC
}
//////////////////////////////////////////////////////////////////////////
void SandboxIntegrationManager::SetEditTool(const char* tool)
{
GetIEditor()->SetEditTool(tool);
}
void SandboxIntegrationManager::LaunchLuaEditor(const char* files)
{
CCryEditApp::instance()->OpenLUAEditor(files);
Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h
-1
View File
@@ -162,7 +162,6 @@ private:
bool GetUndoSliceOverrideSaveValue() override;
bool GetShowCircularDependencyError() override;
void SetShowCircularDependencyError(const bool& showCircularDependencyError) override;
void SetEditTool(const char* tool) override;
void LaunchLuaEditor(const char* files) override;
bool IsLevelDocumentOpen() override;
AZStd::string GetLevelName() override;
Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerWidget.cpp
-13
View File
@@ -312,19 +312,6 @@ void OutlinerWidget::OnSelectionChanged(const QItemSelection& selected, const QI
AzToolsFramework::EntityIdList newlyDeselected;
ExtractEntityIdsFromSelection(deselected, newlyDeselected);
CEditTool* tool = GetIEditor()->GetEditTool();
IClassDesc* classDescription = tool ? tool->GetClassDesc() : nullptr;
if (classDescription && QString::compare(classDescription->ClassName(), "EditTool.Clone") == 0)
{
// if the user clicks an empty space or selects a different entity in the entity outliner, the clone operation will be accepted.
if ((newlySelected.empty() && !newlyDeselected.empty()) || !newlySelected.empty())
{
tool->Accept(true);
GetIEditor()->GetSelection()->FinishChanges();
}
}
AzToolsFramework::ScopedUndoBatch undo("Select Entity");
// initialize the selection command here to store the current selection before