Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18

2021-06-18 13:25:53 -07:00
parent 34e64ca5b0 7486488b60
commit e55580af57
578 changed files with 19526 additions and 20039 deletions
@@ -325,9 +325,8 @@ namespace AZ

        void ShaderVariantAsyncLoader::Reset()
        {
-            // [GFX TODO ATOM-14544] Idealy we want to be able to reset the ShaderVariantAsyncLoader but this is causing some problems that need to be worked out first.
-            //Shutdown();
-            //Init();
+            Shutdown();
+            Init();
        }

        ///////////////////////////////////////////////////////////////////