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.

santorac 1a10369adb Merge branch 'development' into Atom/santorac/RemixableMaterialTypes4_Layering ... There were conflicts in MaterialDocument.cpp which I had resolve by just taking development. This will not compile. I will make additional fixes in another commit. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>		4 years ago
..
Common	Atom/qingtao/atom 16135 (#7334)	4 years ago
Material	Tied up some loose ends with nested property group support.	4 years ago
Model	Removing unneded include form multiple files	4 years ago
Pass	Changed PassBuilder's job dependencies to be OrderOnce.	4 years ago
ResourcePool	move JsonUtils to AzCore	4 years ago
BuilderComponent.cpp	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
BuilderComponent.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
BuilderModule.cpp	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago