Doug McDiarmid 9f8948556f Merge branch 'main' into Atom/dmcdiar/ATOM-15555

2021-05-26 00:03:31 -07:00

..

3rdParty/ACES

Integrating up through commit 90f050496

2021-04-07 14:03:29 -07:00

Include/Atom/Feature

PR feedback

2021-05-19 16:18:02 -07:00

Mocks

Merging WrinkleMask support from 1.0 to main (#680)

2021-05-19 11:21:44 -07:00

Platform/Common

Add newlines to the end of all files

2021-04-23 09:43:40 -07:00

Source

Merge branch 'main' into Atom/dmcdiar/ATOM-15555

2021-05-26 00:03:31 -07:00

Tests

Integrating github/staging through commit 5f214be

2021-04-13 17:18:57 -07:00

atom_feature_common_builders_files.cmake

Initial commit

2021-03-08 14:30:57 -08:00

atom_feature_common_editor_files.cmake

Initial commit

2021-03-08 14:30:57 -08:00

atom_feature_common_files.cmake

Added RayTracingPass and RayTracingPassData

2021-05-24 01:19:37 -07:00

atom_feature_common_public_files.cmake

Integrating github/staging through commit 5f214be

2021-04-13 17:18:57 -07:00

atom_feature_common_shared_files.cmake

Initial commit

2021-03-08 14:30:57 -08:00

atom_feature_common_staticlibrary_files.cmake

ATOM-15223 updating material assignment ID to be portable to other models

2021-05-12 13:47:47 -05:00

atom_feature_common_tests_files.cmake

Integrating github/staging through commit 5f214be

2021-04-13 17:18:57 -07:00

CMakeLists.txt

Adding tone mapping option to Material Editor

2021-04-29 16:51:32 -07:00