Merge pull request #162 from aws-lumberyard-dev/Atom/garrieta/ATOM-15285/variantlist_bug

[ATOM-15285] ShaderVariantAssetBuilder code merge bug

Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderVariantAssetBuilder.cpp

@@ -407,17 +407,20 @@ namespace AZ
             const auto& jobParameters = request.m_jobDescription.m_jobParameters;
             if (jobParameters.find(ShaderVariantLoadErrorParam) != jobParameters.end())
             {
-                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;
-                }
                 AZ_Error(ShaderVariantAssetBuilderName, false, "Error during CreateJobs: %s", jobParameters.at(ShaderVariantLoadErrorParam).c_str());
                 response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Failed;
                 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())
             {