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,6 +15,7 @@
#include <AzCore/Module/Module.h>
#include <ScriptCanvasTestingSystemComponent.h>
#include <Editor/Framework/ScriptCanvasTraceUtilities.h>
#include <Source/Nodes/Nodeables/NodeableTestingLibrary.h>
namespace ScriptCanvasTesting
{
@@ -33,6 +34,9 @@ namespace ScriptCanvasTesting
ScriptCanvasTestingSystemComponent::CreateDescriptor(),
TraceMessageComponent::CreateDescriptor(),
});
AZStd::vector<AZ::ComponentDescriptor*> componentDescriptors(NodeableTestingLibrary::GetComponentDescriptors());
m_descriptors.insert(m_descriptors.end(), componentDescriptors.begin(), componentDescriptors.end());
}
/**