birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/SurfaceData/Code/Source/SurfaceDataEditorModule.cpp
+1 -3
View File
@@ -15,7 +15,6 @@
#include <SurfaceDataSystemComponent.h>
#include <Editor/EditorSurfaceDataSystemComponent.h>
#include <Editor/EditorSurfaceDataColliderComponent.h>
#include <Editor/EditorSurfaceDataMeshComponent.h>
#include <Editor/EditorSurfaceDataShapeComponent.h>
namespace SurfaceData
@@ -25,7 +24,6 @@ namespace SurfaceData
m_descriptors.insert(m_descriptors.end(), {
EditorSurfaceDataSystemComponent::CreateDescriptor(),
EditorSurfaceDataColliderComponent::CreateDescriptor(),
EditorSurfaceDataMeshComponent::CreateDescriptor(),
EditorSurfaceDataShapeComponent::CreateDescriptor()
});
}
@@ -38,4 +36,4 @@ namespace SurfaceData
}
}
AZ_DECLARE_MODULE_CLASS(Gem_SurfaceDataEditor, SurfaceData::SurfaceDataEditorModule)
AZ_DECLARE_MODULE_CLASS(Gem_SurfaceDataEditor, SurfaceData::SurfaceDataEditorModule)