Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18

Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp

@@ -475,6 +475,11 @@ namespace
                 continue;
             }
 
+            if (auto excludeFromPointer = AZ::FindAttribute(AZ::ScriptCanvasAttributes::Internal::ImplementedAsNodeGeneric, behaviorClass->m_attributes))
+            {
+                continue;
+            }
+
             if (auto excludeFromPointer = AZ::FindAttribute(AZ::Script::Attributes::ExcludeFrom, behaviorClass->m_attributes))
             {
                 AZ::Script::Attributes::ExcludeFlags excludeFlags{};

Gems/ScriptCanvas/Code/Editor/View/Windows/mainwindow.ui

@@ -133,12 +133,12 @@
     <addaction name="action_PresetsEditor"/>
     <addaction name="separator"/>
    </widget>
-   <widget class="QMenu" name="menuUtilities">
+   <!-- Disabled until tool is stabilized <widget class="QMenu" name="menuUtilities">
     <property name="title">
      <string>&amp;Utilities</string>
     </property>
     <addaction name="action_UpgradeTool"/>
-   </widget>
+   </widget> -->
    <widget class="QMenu" name="menuSettings_2">
     <property name="title">
      <string>&amp;Preferences</string>

Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.cpp

@@ -3764,6 +3764,12 @@ namespace ScriptCanvas
                 nextSlot = onceResetSlot;
             }
 
+            if (!nextSlot)
+            {
+                AddError(ID.m_node->GetEntityId(), once, "Once node missing next slot, likely needs replacement");
+                return;
+            }
+
             ParseExecutionTreeBody(nextParse, *nextSlot);
             nextParse->MarkDebugEmptyStatement();
         }

Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ParsingUtilities.cpp

@@ -928,6 +928,7 @@ namespace ScriptCanvas
         {
             return execution->GetId().m_node
                 && IsOnce(*execution->GetId().m_node)
+                && execution->GetId().m_slot
                 && execution->GetId().m_slot->GetType() == CombinedSlotType::ExecutionIn;
         }
 
@@ -938,7 +939,7 @@ namespace ScriptCanvas
 
         bool IsOnceReset(const Node& node, const Slot* slot)
         {
-            return slot = OnceProperty::GetResetSlot(&node);
+            return slot == OnceProperty::GetResetSlot(&node);
         }
 
         bool IsOperatorArithmetic(const ExecutionTreeConstPtr& execution)