Doug McDiarmid e769219bac Merge branch 'development' into Atom/dmcdiar/ATOM-5702 ...

# Conflicts:
#	Gems/Atom/RPI/Code/Source/RPI.Public/Shader/Shader.cpp
#	Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderAsset.cpp

2021-06-21 15:26:20 -07:00

..

Material.cpp

Merge branch 'development' into Atom/dmcdiar/ATOM-5702

2021-06-21 15:26:20 -07:00

MaterialSystem.cpp

Made StandardMultilayerPBR hide a layer's property groups when that layer is disabled.

2021-05-12 17:06:57 -07:00