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.

Chris Galvan d7574777a8 Resolved merge conflicts ... Signed-off-by: Chris Galvan <chgalvan@amazon.com>		5 years ago
..
LuaMaterialFunctorSourceData.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
MaterialFunctorSourceData.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
MaterialFunctorSourceDataRegistration.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
MaterialFunctorSourceDataSerializer.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
MaterialPropertyId.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
MaterialPropertySerializer.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
MaterialPropertyValueSerializer.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
MaterialPropertyValueSourceData.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
MaterialPropertyValueSourceDataSerializer.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
MaterialSourceData.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
MaterialSourceDataSerializer.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
MaterialTypeSourceData.cpp	Resolved merge conflicts	5 years ago
MaterialUtils.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago