Merge branch 'development' into cmake/warn_virtual

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> # Conflicts: # Code/Editor/Viewport.h
2021-09-13 08:59:24 -07:00
parent 5815b48a00 d884eef0f4
commit 972944e762
189 changed files with 325 additions and 358 deletions
@@ -115,6 +115,7 @@ namespace AzToolsFramework
        AZ::EntityId CreateNewEntity(AZ::EntityId parentId = AZ::EntityId()) override;
        AZ::EntityId CreateNewEntityAtPosition(const AZ::Vector3& pos, AZ::EntityId parentId = AZ::EntityId()) override;
        AZ::EntityId GetExistingEntity(AZ::u64 id) override;
+        bool EntityExists(AZ::EntityId id) override;
        void DeleteSelected() override;
        void DeleteEntityById(AZ::EntityId entityId) override;
        void DeleteEntities(const EntityIdList& entities) override;