You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

santorac 1a10369adb Merge branch 'development' into Atom/santorac/RemixableMaterialTypes4_Layering ... There were conflicts in MaterialDocument.cpp which I had resolve by just taking development. This will not compile. I will make additional fixes in another commit. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>		4 years ago
..
Common	Instrumented support for the JSON importer for material type files.	4 years ago
Material	Fixed a unit test that broke in my last commit.	4 years ago
Shader	Add "Definitions" field to shader asset	4 years ago