Merge branch 'main' into Atom/santorac/CavityMaps-ATOM-14040

2021-04-21 01:13:09 -07:00
parent 8fe1505d1d b95865b2d8
commit c4771997a2
260 changed files with 11980 additions and 5705 deletions
@@ -420,6 +420,15 @@ namespace AZ
                return;
            }

+            if (jobParameters.find(ShouldExitEarlyFromProcessJobParam) != jobParameters.end())
+            {
+                AZ_TracePrintf(
+                    ShaderVariantAssetBuilderName, "Doing nothing on behalf of [%s] because it's been overriden by game project.",
+                    jobParameters.at(ShaderVariantLoadErrorParam).c_str());
+                response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
+                return;
+            }
+
            AssetBuilderSDK::JobCancelListener jobCancelListener(request.m_jobId);
            if (jobCancelListener.IsCancelled())
            {