puvvadar 6eec6c8f8e Merge pull request #5752 from aws-lumberyard-dev/puvvadar/gitflow_211118_o3de ...

Merge stabilization/2110

2021-11-19 15:46:16 -08:00

..

LuaMaterialFunctor.cpp

Cleanup SerializeContext.h pt.1 (#4264)

2021-09-29 11:31:01 -05:00

MaterialAsset.cpp

Updated material version warning messages to include the affected asset

2021-11-18 15:48:47 -06:00

MaterialAssetCreator.cpp

Enable material version updates.

2021-09-27 11:14:31 -07:00

MaterialAssetCreatorCommon.cpp

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

MaterialDynamicMetadata.cpp

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

MaterialFunctor.cpp

LYN-6882 release builds are executing code in asserts (#4305)

2021-10-01 13:52:52 -07:00

MaterialPropertiesLayout.cpp

Updated the naming convention for material property "names" vs "IDs".

2021-09-17 22:19:31 -07:00

MaterialPropertyDescriptor.cpp

Detail material Id texture created from surface weights. (#4984)

2021-10-27 10:12:13 -05:00

MaterialPropertyValue.cpp

Fixed MaterialPropertyValue::FromAny to preserve the Hint string when converting Asset objects. This fixed an issue where the hint didn't show up in the Material Component's instance inspector.

2021-11-15 23:21:21 -08:00

MaterialTypeAsset.cpp

Moving material type asset PostInit call to be consistent with material asset

2021-11-10 12:58:47 -06:00

MaterialTypeAssetCreator.cpp

Moving material type asset PostInit call to be consistent with material asset

2021-11-10 12:58:47 -06:00

MaterialVersionUpdate.cpp

Made material property auto-rename procedure apply to Material Component at runtime. This ensures that an material property overrides and any gameplay scripts that work with property overrides can get the benefit of the material type version update procedure.

2021-10-21 23:18:08 -07:00

ShaderCollection.cpp

cherry-pick 48f3bb7d

2021-11-10 13:37:15 -06:00