Integrating latest 47acbe8

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
@@ -15,7 +15,7 @@
#include <SmartPointersHelpers.h>
#include <Serialization/IArchive.h>
#include <functor.h>
#include <AzCore/std/functional.h>
namespace Serialization
{
@@ -32,7 +32,7 @@ namespace Serialization
virtual IActionButtonPtr Clone() const = 0;
};
typedef Functor0 FunctorActionButtonCallback;
typedef AZStd::function<void()> FunctorActionButtonCallback;
struct FunctorActionButton
: public IActionButton