Chris Santora c0e7f475d7 Merge branch 'main' into TexturePresets-ATOM-14765

2021-04-19 20:35:50 -07:00

..

LightingPresets

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

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

Materials

Merge branch 'main' into TexturePresets-ATOM-14765

2021-04-19 20:35:50 -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

ATOM-14765 Add More Texture Preset Masks

2021-04-16 23:01:27 -07:00

test.lightingpreset.azasset

Integrating up through commit 90f050496

2021-04-07 14:03:29 -07:00