Jonny Galloway 275fbc714d Merge branch 'aws-lumberyard:main' into cherry-pick_fix_ATOM14976_to_main

2021-05-17 10:32:06 -05:00

..

Assets

replacing 1.0 mat ed model changes, filename change

2021-05-13 16:52:59 -05:00

Code

Merge pull request #687 from aws-lumberyard-dev/Atom/guthadam/ATOM-15128

2021-05-11 13:10:09 -05:00

Scripts

Set scripts to be executable

2021-03-26 09:26:12 -07:00

CMakeLists.txt

Initial commit

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

MaterialEditor.xml

Initial commit

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

preview.svg

ATOM-15128 replacing material editor icon

2021-05-10 18:02:26 -05:00

workspace.mel

Integrating up through commit 90f050496

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