Chris Santora 33745fdad1 Merge branch 'main' into Atom/santorac/CavityMaps-ATOM-14040 ...

Note there were significant conflicts in LightingModel.azsli and StandardPBR_ForwardPass.azsl. I only did basic resolves of these conflicts, mostly preserving the changes from main and distarding the changes in the local branch. The shaders are not compiling at this point, and of course the tests are not passing. I will fix up the code to make corrections in a separate commit, to make it easier to review those changes separate from this merge.

2021-04-20 16:59:27 -07:00

..

Editor/Scripts/LegacyContentConversion

Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00

EnvHDRi

ATOM-13950 Material Editor: Removing auto select option from lighting and model presets

2021-04-18 12:12:32 -05:00

LevelAssets

Integrating latest 47acbe8

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

Objects

Replaced StandardPBR_DiffuseOcclusionState and StandardPBR_SpecularOcclusionState functor scripts with just UseTexture functors. The behavior is the basically the same and a lot simpler. All we lose is the occlusion "enable" flag, which is cleaner anyway.

2021-04-20 16:40:10 -07:00

PostProcess

Initial commit

2021-03-08 14:30:57 -08:00

Textures

Integrating latest 47acbe8

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