Merge commit '8fd9cbfb6456472473ec558c21de9aaa152a53c4' into puvvadar/gitflow_211118_o3de

This commit is contained in:
puvvadar
2021-11-19 09:19:16 -08:00
11 changed files with 99 additions and 132 deletions
@@ -86,7 +86,7 @@ namespace ImageProcessingAtom
IImageObjectPtr ImagePreview::GetOutputImage()
{
return m_output.GetOutputImage(ImageConvertOutput::Preview);
return m_output.GetOutputImage();
}
ImagePreview::~ImagePreview()