Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -15,7 +15,6 @@
 #include <SurfaceDataModule.h>
 #include <SurfaceDataSystemComponent.h>
 #include <Components/SurfaceDataColliderComponent.h>
-#include <Components/SurfaceDataMeshComponent.h>
 #include <Components/SurfaceDataShapeComponent.h>
 #include <TerrainSurfaceDataSystemComponent.h>

@@ -26,7 +25,6 @@ namespace SurfaceData
        m_descriptors.insert(m_descriptors.end(), {
            SurfaceDataSystemComponent::CreateDescriptor(),
            SurfaceDataColliderComponent::CreateDescriptor(),
-            SurfaceDataMeshComponent::CreateDescriptor(),
            SurfaceDataShapeComponent::CreateDescriptor(),
            TerrainSurfaceDataSystemComponent::CreateDescriptor(),
        });