Integrating github/staging through commit b0dd7ed

2021-04-09 12:03:26 -07:00
parent 1044dc3da1
commit c5b955d281
180 changed files with 6416 additions and 1850 deletions
@@ -23,7 +23,7 @@ ly_add_target(
            Source
    BUILD_DEPENDENCIES
        PRIVATE
-            3rdParty::FreeType2
+            3rdParty::freetype
            AZ::AzCore
            AZ::AtomCore
            Legacy::CryCommon
@@ -290,7 +290,7 @@ namespace AZ

        void MeshComponentController::UnregisterModel()
        {
-            if (m_meshFeatureProcessor)
+            if (m_meshFeatureProcessor && m_meshHandle.IsValid())
            {
                MeshComponentNotificationBus::Event(m_entityId, &MeshComponentNotificationBus::Events::OnModelPreDestroy);
                m_meshFeatureProcessor->ReleaseMesh(m_meshHandle);