Merge branch 'main' into carlitosan-parser-fixes

2021-04-27 12:10:53 -07:00
parent 66dd89aacd 71c315b2b7
commit 5544621bcc
294 changed files with 14405 additions and 20747 deletions
@@ -528,8 +528,10 @@ namespace ScriptCanvasEditor
        {
            const auto& variableId = varConfig.m_graphVariable.GetVariableId();

+            // We only add component sourced graph properties to the script canvas component, so if this variable was switched to a graph-only property remove it.
+            // Also be sure to remove this variable if it's been deleted entirely.
            auto graphVariable = graphVarData.FindVariable(variableId);
-            if (!graphVariable->IsComponentProperty())
+            if (!graphVariable || !graphVariable->IsComponentProperty())
            {
                oldVariableIds.push_back(variableId);
            }