Merge branch 'development' into cmake/SPEC-7182

2021-08-10 18:05:28 -07:00
parent a9cd126026 c484e685d1
commit fe635d5ab4
1128 changed files with 34097 additions and 42998 deletions
@@ -69,7 +69,7 @@ AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
    void LoadObjects(XmlNodeRef& rootObjectsNode);

    //! Load one object from archive.
-    CBaseObject* LoadObject(const XmlNodeRef& objNode, CBaseObject* pPrevObject = NULL);
+    CBaseObject* LoadObject(const XmlNodeRef& objNode, CBaseObject* pPrevObject = nullptr);

    //////////////////////////////////////////////////////////////////////////
    int GetLoadedObjectsCount() { return static_cast<int>(m_loadedObjects.size()); }