Chris Santora 7443599e25 Merge branch 'main' into Atom/santorac/PomHeightOffset-ATOM-14495 ...

Conflicts:
Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_DepthPass_WithPS.azsl
Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_ForwardPass.azsl
Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_ForwardPass.azsl
Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_DepthPass_WithPS.azsl
Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ForwardPass.azsl

2021-05-05 00:46:42 -07:00

..

LightingPresets

Add newlines to the end of all files

2021-04-23 09:43:40 -07:00

Materials

Merge branch 'main' into Atom/santorac/PomHeightOffset-ATOM-14495

2021-05-05 00:46:42 -07:00

Multi-mat_fbx

Integrating latest 47acbe8

2021-03-25 13:57:57 -07:00

Objects/cube

Integrating latest 47acbe8

2021-03-25 13:57:57 -07:00

Textures

Add newlines to the end of all files

2021-04-23 09:43:40 -07:00

test.lightingpreset.azasset

Add newlines to the end of all files

2021-04-23 09:43:40 -07:00