Integrating latest 47acbe8

This commit is contained in:
alexpete
2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
@@ -23,6 +23,7 @@ namespace ImageProcessing
{
class ImageProcessingSystemComponent
: public AZ::Component
, protected ImageProcessingRequestBus::Handler
, protected ImageProcessingEditor::ImageProcessingEditorRequestBus::Handler
, protected AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler
, protected AzToolsFramework::AssetBrowser::AssetBrowserTexturePreviewRequestsBus::Handler
@@ -43,6 +44,12 @@ namespace ImageProcessing
void OpenSourceTextureFile(const AZ::Uuid& textureSourceID) override;
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
// ImageProcessingRequestBus interface implementation
IImageObjectPtr LoadImage(const AZStd::string& filePath) override;
IImageObjectPtr LoadImagePreview(const AZStd::string& filePath) override;
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
// AZ::Component interface implementation
void Init() override;