Merge branch 'main' into Prefab/CreatePrefab

This commit is contained in:
srikappa
2021-04-27 15:41:04 -07:00
4912 changed files with 44763 additions and 90471 deletions
@@ -228,6 +228,10 @@ namespace AzToolsFramework
AZ_Assert(instanceDom.IsObject(), "Link Id '%u' cannot be added because the DOM of the instance is not an object.", m_id);
instanceDom.AddMember(rapidjson::StringRef(PrefabDomUtils::LinkIdName), rapidjson::Value().SetUint64(m_id), allocator);
}
else
{
linkIdReference->get().SetUint64(m_id);
}
}
} // namespace Prefab