Merge branch 'development' into scripting/text_updates_pass5

This commit is contained in:
lsemp3d
2021-11-22 12:24:00 -08:00
453 changed files with 7800 additions and 4031 deletions
@@ -200,7 +200,7 @@ namespace ScriptCanvasEditor
AZ::TypeId DataTypePaletteModel::FindTypeIdForIndex(const QModelIndex& index) const
{
AZ::TypeId retVal;
AZ::TypeId retVal = AZ::TypeId::CreateNull();
if (index.row() >= 0 && index.row() < m_variableTypes.size())
{
@@ -877,6 +877,7 @@ namespace ScriptCanvasEditor
void NodePaletteModel::RepopulateModel()
{
AZ_PROFILE_FUNCTION(ScriptCanvas);
ClearRegistry();
PopulateNodePaletteModel((*this));
@@ -428,6 +428,8 @@ namespace ScriptCanvasEditor
, m_closeCurrentGraphAfterSave(false)
, m_styleManager(ScriptCanvasEditor::AssetEditorId, "ScriptCanvas/StyleSheet/graphcanvas_style.json")
{
AZ_PROFILE_FUNCTION(ScriptCanvas);
VariablePaletteRequestBus::Handler::BusConnect();
GraphCanvas::AssetEditorAutomationRequestBus::Handler::BusConnect(ScriptCanvasEditor::AssetEditorId);