Chris Galvan 94644cad1e Merged development, fixed merge conflict ...

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

2022-02-08 15:31:49 -06:00

..

BuilderSettings

Moved the ImageProcessingDefines to the Include folder and added it to the header only target

2022-02-03 15:05:01 -06:00

Compressors

Moved the ImageProcessingDefines to the Include folder and added it to the header only target

2022-02-03 15:05:01 -06:00

Converters

Remove -Wno-unused-value suppression for GCC (#7387)

2022-02-07 13:49:25 -08:00

Editor

Collection of miscellaneous PAL changes required for restricted platforms. (#6482)

2021-12-20 08:15:10 -07:00

ImageLoader

LYN-8837 o3de Material Editor - Texture Settings Editor - Hangs when converting texture (#6359)

2021-12-13 14:30:53 -08:00

Platform

GCC Support for Linux

2022-01-20 13:00:02 -08:00

Previewer

Merge branch 'development' into cmake/SPEC-7179

2021-07-16 15:42:37 -07:00

Processing

Moved the ImageProcessingDefines to the Include folder and added it to the header only target

2022-02-03 15:05:01 -06:00

Thumbnail

Updated thumbnail notification bus to use const QPixmap&

2021-10-12 14:41:26 -05:00

ImageBuilderBaseType.h

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

ImageBuilderComponent.cpp

Moved the ImageProcessingDefines to the Include folder and added it to the header only target

2022-02-03 15:05:01 -06:00

ImageBuilderComponent.h

Deprecate profiler categories based on global enum

2021-08-18 17:33:09 -06:00

ImageProcessingModule.cpp

Merge branch 'development' into cmake/SPEC-7179

2021-07-16 15:42:37 -07:00

ImageProcessingSystemComponent.cpp

Moved the ImageProcessingDefines to the Include folder and added it to the header only target

2022-02-03 15:05:01 -06:00

ImageProcessingSystemComponent.h

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00