santorac fbe17b0022 Merge remote-tracking branch 'upstream/development' into Atom/santorac/MaterialAssetDeferredBaking3

2022-01-19 12:30:58 -08:00

..

AtomBridge

Templates restricted (#6498)

2022-01-14 10:27:20 -08:00

AtomFont

Templates restricted (#6498)

2022-01-14 10:27:20 -08:00

AtomImGuiTools

Templates restricted (#6498)

2022-01-14 10:27:20 -08:00

AtomViewportDisplayIcons

Templates restricted (#6498)

2022-01-14 10:27:20 -08:00

AtomViewportDisplayInfo

Templates restricted (#6498)

2022-01-14 10:27:20 -08:00

CommonFeatures

Atom Tools: disabling auto load of unused gems in some atom tools

2022-01-18 17:14:49 -06:00

EMotionFXAtom

Merge pull request #6818 from windbagjacket/development

2022-01-18 14:33:01 -06:00

ImguiAtom

Templates restricted (#6498)

2022-01-14 10:27:20 -08:00

TechnicalArt/DccScriptingInterface

Updated all .material files to have materialTypeVersion instead of propertyLayoutVersion. This was renamed in code at some point but we forgot to rename in the files. Before this was silently ignored but since I removed MaterialSourceDataSerializer, this started being reported as a warning.

2022-01-18 19:02:36 -08:00

CMakeLists.txt

Templates restricted (#6498)

2022-01-14 10:27:20 -08:00

gem.json

Templates restricted (#6498)

2022-01-14 10:27:20 -08:00