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
..
LuaMaterialFunctor.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
MaterialAsset.cpp	Resolved merge conflicts	5 years ago
MaterialAssetCreator.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
MaterialAssetCreatorCommon.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
MaterialDynamicMetadata.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
MaterialFunctor.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
MaterialPropertiesLayout.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
MaterialPropertyDescriptor.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
MaterialPropertyValue.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago
MaterialTypeAsset.cpp	Resolved merge conflicts	5 years ago
MaterialTypeAssetCreator.cpp	Resolved merge conflicts	5 years ago
ShaderCollection.cpp	Final update copyright headers to reference license files at the repo root (#1693)	5 years ago