Merge branch 'development' into cmake/win_fix_warn_4296

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 11:18:43 -07:00
parent 83f8d90e28 aa68122002
commit b3023242d0
116 changed files with 4638 additions and 4173 deletions
@@ -1515,8 +1515,8 @@ void CBaseObject::Serialize(CObjectArchive& ar)
        SetFrozen(bFrozen);
        SetHidden(bHidden);

-        ar.SetResolveCallback(this, parentId, AZStd::bind(&CBaseObject::ResolveParent, this, AZStd::placeholders::_1 ));
-        ar.SetResolveCallback(this, lookatId, AZStd::bind(&CBaseObject::SetLookAt, this, AZStd::placeholders::_1));
+        ar.SetResolveCallback(this, parentId, [this](CBaseObject* parent) { ResolveParent(parent); });
+        ar.SetResolveCallback(this, lookatId, [this](CBaseObject* target) { SetLookAt(target); });

        InvalidateTM(0);
        SetModified(false);