Merge branch 'development' into Atom/santorac/RemixableMaterialTypes

This commit is contained in:
santorac
2021-09-30 01:36:42 -07:00
294 changed files with 2311 additions and 1074 deletions
@@ -24,6 +24,8 @@ namespace AZ
{
namespace RPI
{
class ModelAsset;
class Model final
: public Data::InstanceData
{