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
@@ -135,6 +135,16 @@ namespace ScriptCanvasEditor
AZStd::vector< ScriptCanvas::Data::Type > GetBehaviorContextObjectTypes() const override;
AZStd::vector< ScriptCanvas::Data::Type > GetMapTypes() const override;
AZStd::vector< ScriptCanvas::Data::Type > GetArrayTypes() const override;
bool IsShowingVariablePalette() const override;
bool IsShowingGraphVariables() const override;
QPushButton* GetCreateVariableButton() const override;
QTableView* GetGraphPaletteTableView() const override;
QTableView* GetVariablePaletteTableView() const override;
QLineEdit* GetVariablePaletteFilter() const override;
QLineEdit* GetGraphVariablesFilter() const override;
////
// AzToolsFramework::EditorEvents::Bus
@@ -147,6 +157,8 @@ namespace ScriptCanvasEditor
const ScriptCanvas::ScriptCanvasId& GetActiveScriptCanvasId() const;
bool IsValidVariableType(const ScriptCanvas::Data::Type& dataType) const;
public slots:
void OnCreateVariable(ScriptCanvas::Data::Type varType);
void OnCreateNamedVariable(const AZStd::string& variableName, ScriptCanvas::Data::Type varType);
@@ -162,10 +174,8 @@ namespace ScriptCanvasEditor
private:
bool IsShowingVariablePalette() const;
void ShowVariablePalette();
bool IsShowingGraphVariables() const;
void ShowGraphVariables();
void FocusOnSearchFilter();