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

Integrating github/staging through commit 5f214be

Browse Source
This commit is contained in:
alexpete
2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponent.cpp
-2
View File
@@ -32,7 +32,6 @@ namespace LmbrCentral
provided.push_back(AZ_CRC("PolygonPrismShapeService", 0x1cbc4ed4));
provided.push_back(AZ_CRC("VariableVertexContainerService", 0x70c58740));
provided.push_back(AZ_CRC("FixedVertexContainerService", 0x83f1bbf2));
provided.push_back(AZ_CRC("AreaLightShapeService", 0x68ea78dc));
}
void EditorPolygonPrismShapeComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
@@ -40,7 +39,6 @@ namespace LmbrCentral
EditorBaseShapeComponent::GetIncompatibleServices(incompatible);
incompatible.push_back(AZ_CRC("VariableVertexContainerService", 0x70c58740));
incompatible.push_back(AZ_CRC("FixedVertexContainerService", 0x83f1bbf2));
incompatible.push_back(AZ_CRC("AreaLightShapeService", 0x68ea78dc));
}
void EditorPolygonPrismShapeComponent::GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)