birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating latest 47acbe8

Browse Source
This commit is contained in:
alexpete
2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Editor/Objects/ObjectManager.h
+3 -3
View File
@@ -315,8 +315,8 @@ public:
//////////////////////////////////////////////////////////////////////////
// ObjectManager notification Callbacks.
//////////////////////////////////////////////////////////////////////////
void AddObjectEventListener(const EventCallback& cb);
void RemoveObjectEventListener(const EventCallback& cb);
void AddObjectEventListener(EventListener* listener);
void RemoveObjectEventListener(EventListener* listener);
//////////////////////////////////////////////////////////////////////////
// Used to indicate starting and ending of objects loading.
@@ -445,7 +445,7 @@ private:
//////////////////////////////////////////////////////////////////////////
// Listeners.
std::list<EventCallback> m_objectEventListeners;
std::list<EventListener*> m_objectEventListeners;
bool m_bExiting;