Skip to content

Commit

Permalink
22333: Fixes bug introduced to entity persistence in last PR (#313)
Browse files Browse the repository at this point in the history
  • Loading branch information
howsohazard authored Nov 26, 2024
1 parent 96f3044 commit b318fe4
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions src/Amalgam/AssetManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -333,11 +333,7 @@ Entity *AssetManager::LoadEntityFromResource(AssetParameters &asset_params, bool
}

if(persistent)
{
delete new_entity;
return nullptr;
}
//SetEntityPersistenceForFlattenedEntity(new_entity, &asset_params);
SetEntityPersistenceForFlattenedEntity(new_entity, &asset_params);

return new_entity;
}
Expand All @@ -362,11 +358,7 @@ Entity *AssetManager::LoadEntityFromResource(AssetParameters &asset_params, bool
new_entity->evaluableNodeManager.FreeNode(call_stack);

if(persistent)
{
delete new_entity;
return nullptr;
}
// SetEntityPersistenceForFlattenedEntity(new_entity, &asset_params);
SetEntityPersistenceForFlattenedEntity(new_entity, &asset_params);

return new_entity;
}
Expand Down

0 comments on commit b318fe4

Please sign in to comment.