Integrating github/staging through commit 5f214be

2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
@@ -49,7 +49,7 @@ namespace ImageProcessingAtom
        bool IsExtensionSupported(const char* extension);
        IImageObject* LoadImageFromFile(const AZStd::string& filename);

-        // These functions are for loading legacy lumberyard dds files
+        // These functions are for loading legacy O3DE dds files
        IImageObject* LoadImageFromFileLegacy(const AZStd::string& filename);
        IImageObject* LoadImageFromFileStreamLegacy(AZ::IO::SystemFileStream& fileLoadStream);
        IImageObject* LoadAttachedImageFromDdsFileLegacy(const AZStd::string& filename, IImageObjectPtr originImage);