Merging from development

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-12-07 12:35:41 -08:00
parent b1eeebb6b6
commit cd5306febf
334 changed files with 9946 additions and 3757 deletions
@@ -46,7 +46,7 @@ namespace ScriptCanvasEditor
void Undo() override;
void Redo() override;
virtual void Capture(ScriptCanvasMemoryAsset& memoryAsset, bool captureUndo);
virtual void Capture(Graph* graph, bool captureUndo);
bool Changed() const override;
@@ -76,7 +76,7 @@ namespace ScriptCanvasEditor
void Undo() override;
void Redo() override;
void Capture(ScriptCanvasMemoryAsset& memoryAsset, bool captureUndo) override;
void Capture(Graph* graph, bool captureUndo) override;
void RestoreItem(const AZStd::vector<AZ::u8>& restoreBuffer) override;
@@ -103,7 +103,7 @@ namespace ScriptCanvasEditor
void Undo() override;
void Redo() override;
void Capture(ScriptCanvasMemoryAsset& memoryAsset, bool captureUndo) override;
void Capture(Graph* graph, bool captureUndo) override;
protected:
GraphItemAddCommand(const GraphItemAddCommand&) = delete;
@@ -124,7 +124,7 @@ namespace ScriptCanvasEditor
void Undo() override;
void Redo() override;
void Capture(ScriptCanvasMemoryAsset& memoryAsset, bool captureUndo) override;
void Capture(Graph* graph, bool captureUndo) override;
protected:
GraphItemRemovalCommand(const GraphItemRemovalCommand&) = delete;