Integrating up through commit 90f050496

2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
@@ -100,9 +100,9 @@ namespace AzFramework
        //! @param idRemapTable if remapIds is true, the provided table is filled with a map of original ids to new ids
        //! @param filterDesc any ObjectStream::LoadFlags
        //! @return whether or not the root slice was successfully loaded from the provided stream
-        virtual bool LoadFromStream(AZ::IO::GenericStream& stream, bool remapIds,
+        bool LoadFromStream(AZ::IO::GenericStream& stream, bool remapIds,
            EntityIdToEntityIdMap* idRemapTable = nullptr,
-            const AZ::ObjectStream::FilterDescriptor& filterDesc = AZ::ObjectStream::FilterDescriptor());
+            const AZ::ObjectStream::FilterDescriptor& filterDesc = AZ::ObjectStream::FilterDescriptor()) override;

        //! Executes the post-add actions for the provided list of entities, like connecting to required ebuses.
        //! @param entities The entities to perform the post-add actions for.