Merging latest origin

2021-05-07 16:28:11 -07:00
parent 80f6dcd258 4c453bf4b6
commit 1df2fe1d48
141 changed files with 2843 additions and 1178 deletions
@@ -164,6 +164,7 @@ namespace AZ
            if (m_featureProcessor)
            {
                m_featureProcessor->RemoveProbe(m_handle);
+                m_handle = nullptr;
            }

            LmbrCentral::ShapeComponentNotificationsBus::Handler::BusDisconnect();