Integrating up through commit 90f050496

2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
@@ -682,6 +682,11 @@ namespace GraphCanvas
        {
            AZ_Error("GraphCanvas", !m_trackingTarget.IsValid(), "Trying to track a second target for gestures while still tracking the first.");

+            if (GeometryNotificationBus::Handler::BusIsConnected())
+            {
+                GeometryNotificationBus::Handler::BusDisconnect();
+            }
+
            GeometryNotificationBus::Handler::BusConnect(elementId);

            m_trackingTarget = elementId;