Merge branch 'development' into Prefab/DestroyGameEntitySupport
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
This commit is contained in:
@@ -105,7 +105,7 @@ namespace AzFramework
|
||||
virtual AZ::Matrix3x4 PopPremultipliedMatrix() { return AZ::Matrix3x4::CreateIdentity(); }
|
||||
|
||||
protected:
|
||||
~DebugDisplayRequests() = default;
|
||||
virtual ~DebugDisplayRequests() = default;
|
||||
};
|
||||
|
||||
/// Inherit from DebugDisplayRequestBus::Handler to implement the DebugDisplayRequests interface.
|
||||
|
||||
@@ -69,7 +69,7 @@ namespace AzFramework
|
||||
// EntityContext
|
||||
AZ::Entity* CreateEntity(const char* name) override;
|
||||
void OnRootEntityReloaded() override;
|
||||
void OnContextEntitiesAdded(const EntityList& entities);
|
||||
void OnContextEntitiesAdded(const EntityList& entities) override;
|
||||
void OnContextReset() override;
|
||||
bool ValidateEntitiesAreValidForContext(const EntityList& entities) override;
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
Reference in New Issue
Block a user