Nicholas Van Sickle 8d5dd4e35f Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/StabToDevNov21 ...

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

2021-11-11 10:15:52 -08:00

..

AtomToolsFramework

Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/StabToDevNov21

2021-11-11 10:15:52 -08:00

MaterialEditor

Updating parent path usage has part of cherry picked from stabilization combining source data changes with relative path changes

2021-11-10 14:42:55 -06:00

ShaderCanvas

Initial commit

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

ShaderManagementConsole

Update the FileIO Aliases (#4186)

2021-10-05 15:12:53 -05:00

CMakeLists.txt

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

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