From 4dc97526202fc0f8583c93eab701e48d5535b858 Mon Sep 17 00:00:00 2001
From: John Jones-Steele <jjjoness@amazon.com>
Date: Mon, 14 Jun 2021 13:50:29 +0100
Subject: [PATCH] Fixes crash in adding WireFrame/

---
 .../Editor/Core/LevelEditorMenuHandler.cpp    |  1 -
 Code/Sandbox/Editor/CryEdit.cpp               | 27 -------------------
 Code/Sandbox/Editor/CryEdit.h                 |  1 -
 3 files changed, 29 deletions(-)

diff --git a/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp b/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp
index ebc688f9da..c96f6be3a3 100644
--- a/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp
+++ b/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp
@@ -717,7 +717,6 @@ QMenu* LevelEditorMenuHandler::CreateViewMenu()
         });
 #endif
 
-    viewportViewsMenuWrapper.AddAction(ID_WIREFRAME);
     viewportViewsMenuWrapper.AddSeparator();
 
     if (CViewManager::IsMultiViewportEnabled())
diff --git a/Code/Sandbox/Editor/CryEdit.cpp b/Code/Sandbox/Editor/CryEdit.cpp
index 6f81580251..79a06b7964 100644
--- a/Code/Sandbox/Editor/CryEdit.cpp
+++ b/Code/Sandbox/Editor/CryEdit.cpp
@@ -400,8 +400,6 @@ void CCryEditApp::RegisterActionHandlers()
     ON_COMMAND(ID_GAME_SYNCPLAYER, OnSyncPlayer)
     ON_COMMAND(ID_RESOURCES_REDUCEWORKINGSET, OnResourcesReduceworkingset)
 
-    ON_COMMAND(ID_WIREFRAME, OnWireframe)
-
     ON_COMMAND(ID_VIEW_CONFIGURELAYOUT, OnViewConfigureLayout)
 
     ON_COMMAND(IDC_SELECTION, OnDummyCommand)
@@ -3466,31 +3464,6 @@ void CCryEditApp::OnResourcesReduceworkingset()
 #endif
 }
 
-void CCryEditApp::OnWireframe()
-{
-    int             nWireframe(R_SOLID_MODE);
-    ICVar*      r_wireframe(gEnv->pConsole->GetCVar("r_wireframe"));
-
-    if (r_wireframe)
-    {
-        nWireframe = r_wireframe->GetIVal();
-    }
-
-    if (nWireframe != R_WIREFRAME_MODE)
-    {
-        nWireframe = R_WIREFRAME_MODE;
-    }
-    else
-    {
-        nWireframe = R_SOLID_MODE;
-    }
-
-    if (r_wireframe)
-    {
-        r_wireframe->Set(nWireframe);
-    }
-}
-
 void CCryEditApp::OnUpdateWireframe(QAction* action)
 {
     Q_ASSERT(action->isCheckable());
diff --git a/Code/Sandbox/Editor/CryEdit.h b/Code/Sandbox/Editor/CryEdit.h
index e37fb53561..2206fd8ce2 100644
--- a/Code/Sandbox/Editor/CryEdit.h
+++ b/Code/Sandbox/Editor/CryEdit.h
@@ -372,7 +372,6 @@ private:
     friend struct PythonTestOutputHandler;
 
     void OpenProjectManager(const AZStd::string& screen);
-    void OnWireframe();
     void OnUpdateWireframe(QAction* action);
     void OnViewConfigureLayout();