Tommy Walton 1e42261d76 Merge remote-tracking branch 'upstream/development' into amzn-tommy/gitflow_211116_o3de2 ...

Signed-off-by: Tommy Walton <waltont@amazon.com>

2021-11-17 09:04:04 -08:00

..

3rdParty/ACES

Overhaul of LookModification (#3282)

2021-08-18 16:59:34 -05:00

Include/Atom/Feature

Terrain detail textures support with bindless arrays (#5460)

2021-11-17 10:30:06 -06:00

Mocks

Addressed PR feedback

2021-11-10 11:56:45 -08:00

Source

Merge commit '5c0fe6a54f14d1770334679e0457702a37a946c2' into amzn-tommy/gitflow_211116_o3de2

2021-11-16 12:54:30 -08:00

Tests

Terrain detail textures support with bindless arrays (#5460)

2021-11-17 10:30:06 -06:00

atom_feature_common_builders_files.cmake

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

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

atom_feature_common_editor_files.cmake

Terrain feature processor improvements regarding material, mesh, and lod (#4303)

2021-09-28 15:31:59 -05:00

atom_feature_common_files.cmake

merging dev

2021-10-21 22:37:12 -07:00

atom_feature_common_public_files.cmake

Editor HDR Color Grading Component implemented under the PostFx stack (#4159)

2021-09-21 16:19:30 -05:00

atom_feature_common_shared_files.cmake

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

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

atom_feature_common_staticlibrary_files.cmake

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

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

atom_feature_common_tests_files.cmake

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

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

CMakeLists.txt

Add cmake file for editor scripts. Add constexpr keyword to constants. Use AZ_CRC_CE for LookModificationComponent.

2021-10-15 12:56:19 -07:00