Merge branch 'development' into Prefab/SaveAllPrefabs
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
This commit is contained in:
@@ -463,7 +463,7 @@ namespace AzToolsFramework
|
||||
linkId, templateId, templateToDelete.GetFilePath().c_str());
|
||||
}
|
||||
|
||||
result = m_templateToLinkIdsMap.erase(templateToLinkIterator) != 0;
|
||||
result = m_templateToLinkIdsMap.erase(templateToLinkIterator) != nullptr;
|
||||
AZ_Assert(result,
|
||||
"Prefab - PrefabSystemComponent::RemoveTemplate - "
|
||||
"Failed to remove Template with Id '%llu' on file path '%s' "
|
||||
@@ -858,7 +858,7 @@ namespace AzToolsFramework
|
||||
|
||||
PrefabDomValue& instance = instanceIterator->value;
|
||||
AZ_Assert(instance.IsObject(), "Nested instance DOM provided is not a valid JSON object.");
|
||||
PrefabDomValueReference sourceTemplateName = PrefabDomUtils::FindPrefabDomValue(instance, PrefabDomUtils::SourceName);
|
||||
[[maybe_unused]] PrefabDomValueReference sourceTemplateName = PrefabDomUtils::FindPrefabDomValue(instance, PrefabDomUtils::SourceName);
|
||||
AZ_Assert(sourceTemplateName, "Couldn't find source template name in the DOM of the nested instance while creating a link.");
|
||||
AZ_Assert(
|
||||
sourceTemplateName->get() == sourceTemplate.GetFilePath().c_str(),
|
||||
|
||||
Reference in New Issue
Block a user