Integrating github/staging through commit ab87ed9

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
@@ -85,7 +85,8 @@ namespace WhiteBox
m_physicsColliderConfiguration.SetPropertyVisibility(Physics::ColliderConfiguration::Offset, false);
m_physicsColliderConfiguration.SetPropertyVisibility(Physics::ColliderConfiguration::IsTrigger, false);
if (m_sceneInterface = AZ::Interface<AzPhysics::SceneInterface>::Get())
m_sceneInterface = AZ::Interface<AzPhysics::SceneInterface>::Get();
if (m_sceneInterface)
{
m_editorSceneHandle = m_sceneInterface->GetSceneHandle(AzPhysics::EditorPhysicsSceneName);
}
@@ -78,7 +78,9 @@ namespace WhiteBox
for (AZ::u32 i = 0; i < triangleCount; ++i)
{
#if defined(AZ_ENABLE_TRACING)
const auto& trianglePositions = trianglesPositions[i];
#endif
const auto& triangleUVs = trianglesUVs[i];
const auto& triangleEdges = trianglesEdges[i];
@@ -96,7 +96,7 @@ namespace UnitTest
// when
// add an editor white box collider component
entity.Deactivate();
auto editorWhiteBoxColliderComponent = entity.CreateComponent<WhiteBox::EditorWhiteBoxColliderComponent>();
entity.CreateComponent<WhiteBox::EditorWhiteBoxColliderComponent>();
entity.Activate();
// then