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 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.		5 years ago
..
Editor/Scripts/LegacyContentConversion	Integrating github/staging through commit ab87ed9	5 years ago
EnvHDRi	ATOM-13950 Material Editor: Removing auto select option from lighting and model presets	5 years ago
LevelAssets	Integrating latest 47acbe8	5 years ago
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.	5 years ago
PostProcess	Initial commit	5 years ago
Textures	Integrating latest 47acbe8	5 years ago