From 588127772c0fd9fbb30310ee402b8dab042fbf23 Mon Sep 17 00:00:00 2001
From: mnaumov <mnaumov@amazon.com>
Date: Mon, 14 Jun 2021 12:40:19 -0700
Subject: [PATCH] Fixing missing preview in texture settings

---
 .../Code/Source/Processing/ImageConvertJob.cpp        | 11 ++---------
 .../Code/Source/Processing/ImageConvertJob.h          |  1 -
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.cpp
index c6f0d3946a..fab8d47885 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.cpp
@@ -109,14 +109,7 @@ namespace ImageProcessingAtom
         while (!m_process->IsFinished() && !IsJobCancelled())
         {
             m_process->UpdateProcess();
-            if (m_isPreview)
-            {
-                m_output->SetProgress(m_process->GetProgress() / static_cast<float>(m_previewProcessStep));
-            }
-            else
-            {
-                m_output->SetProgress(m_process->GetProgress());
-            }
+            m_output->SetProgress(m_process->GetProgress() / static_cast<float>(m_previewProcessStep));
         }
 
         IImageObjectPtr outputImage = m_process->GetOutputImage();
@@ -125,7 +118,7 @@ namespace ImageProcessingAtom
         m_output->SetOutputImage(outputImage, ImageConvertOutput::Base);
         m_output->SetOutputImage(outputImageAlpha, ImageConvertOutput::Alpha);
 
-        if (m_isPreview && !IsJobCancelled())
+        if (!IsJobCancelled())
         {
             // For preview, combine image output with alpha if any
             m_output->SetProgress(1.0f / static_cast<float>(m_previewProcessStep));
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.h
index a0cf3ad488..17e6191314 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.h
@@ -72,7 +72,6 @@ namespace ImageProcessingAtom
         static const int m_previewProcessStep = 2;
 
         AZStd::unique_ptr<ImageConvertProcess> m_process;
-        bool m_isPreview;
         AZStd::atomic_bool m_isCancelled;
         ImageConvertOutput* m_output;
     };