santorac f89977abe3 Merge pull request #7054 from aws-lumberyard-dev/Atom/santorac/RemixableMaterialTypes2_FIX2 ...

Made MaterialPropertyId Be More Generic

2022-01-24 13:18:11 -08:00

..

Assets

Since I was already working with _dev_shaderball_00_basecolor.png from AtomLyIntegration gem, I went ahead and updated the one in MaterialEditor to match, because I noticed that the one from AtomLyIntegration was a bit nicer, having colored arrays instead of low contrast gray ones.

2021-09-23 12:42:10 -07:00

Code

Merge pull request #7054 from aws-lumberyard-dev/Atom/santorac/RemixableMaterialTypes2_FIX2

2022-01-24 13:18:11 -08:00

Scripts

Update the FileIO Aliases (#4186)

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

CMakeLists.txt

Templates restricted (#6498)

2022-01-14 10:27:20 -08:00

gem.json

Templates restricted (#6498)

2022-01-14 10:27:20 -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