birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating latest 47acbe8

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
Gems/GradientSignal/Code/Source/Editor/EditorImageBuilderComponent.cpp
+6 -10
View File
@@ -260,17 +260,15 @@ namespace GradientSignal
static AZStd::unique_ptr<ImageAsset> LegacyLoadImageFromPath(const AZStd::string& fullPath)
{
ImageProcessing::IImageObject* rawImage = nullptr;
ImageProcessing::ImageProcessingRequestBus::BroadcastResult(rawImage, &ImageProcessing::ImageProcessingRequests::LoadImage,
ImageProcessing::IImageObjectPtr imageObject;
ImageProcessing::ImageProcessingRequestBus::BroadcastResult(imageObject, &ImageProcessing::ImageProcessingRequests::LoadImage,
fullPath);
if (!rawImage)
if (!imageObject)
{
return {};
}
AZStd::unique_ptr<ImageProcessing::IImageObject> imageObject{ rawImage };
//create a new image asset
auto imageAsset = AZStd::make_unique<ImageAsset>();
@@ -303,17 +301,15 @@ namespace GradientSignal
static AZStd::unique_ptr<ImageAsset> AtomLoadImageFromPath(const AZStd::string& fullPath)
{
ImageProcessingAtom::IImageObject* rawImage = nullptr;
ImageProcessingAtom::ImageProcessingRequestBus::BroadcastResult(rawImage, &ImageProcessingAtom::ImageProcessingRequests::LoadImage,
ImageProcessingAtom::IImageObjectPtr imageObject;
ImageProcessingAtom::ImageProcessingRequestBus::BroadcastResult(imageObject, &ImageProcessingAtom::ImageProcessingRequests::LoadImage,
fullPath);
if (!rawImage)
if (!imageObject)
{
return {};
}
AZStd::unique_ptr<ImageProcessingAtom::IImageObject> imageObject{ rawImage };
//create a new image asset
auto imageAsset = AZStd::make_unique<ImageAsset>();