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

merge system component

Browse Source 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
This commit is contained in:
chcurran
2021-09-24 13:05:59 -07:00
parent e125462eaa 66a875bf79
commit 72ff163ff0
1762 changed files with 66552 additions and 51567 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Editor/SystemComponent.h
+2 -1
View File
@@ -60,7 +60,7 @@ namespace ScriptCanvasEditor
////////////////////////////////////////////////////////////////////////
// SystemRequestBus::Handler...
void AddAsyncJob(AZStd::function<void()>&& jobFunc) override;
void GetEditorCreatableTypes(AZStd::unordered_set<ScriptCanvas::Data::Type>& outCreatableTypes);
void GetEditorCreatableTypes(AZStd::unordered_set<ScriptCanvas::Data::Type>& outCreatableTypes) override;
void CreateEditorComponentsOnEntity(AZ::Entity* entity, const AZ::Data::AssetType& assetType) override;
////////////////////////////////////////////////////////////////////////
@@ -97,6 +97,7 @@ namespace ScriptCanvasEditor
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
void ClearGraphsThatNeedUpgrade()
private:
SystemComponent(const SystemComponent&) = delete;