From 92b0514b4842ab75ca5dcad86a6d084e95f59e9f Mon Sep 17 00:00:00 2001
From: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
Date: Mon, 20 Dec 2021 15:20:38 -0600
Subject: [PATCH] Merge commit 'fb36145e2e1f34574948233aa65eaa97f20e6e67' into
 mbalfour/gitflow_211220_stabilization_2111RTE

# Conflicts:
#	Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.cpp

Also fixed bad merge on ScripCanvas MainWindow.cpp

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
---
 Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
index 37ef63c1a1..f0bee2171a 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
@@ -1617,7 +1617,6 @@ namespace ScriptCanvasEditor
         }
 
         PrepareAssetForSave(inMemoryAssetId);
-        ScriptCanvasAssetDescription assetDescription;
 
         AZStd::string suggestedFilename;
         AZStd::string suggestedFileFilter;