Merge pull request #7694 from aws-lumberyard-dev/TerrainBuildFix

Fix build error due to const qualifiers not matching
monroegm-disable-blank-issue-2
Chris Galvan 4 years ago committed by GitHub
commit 577767acc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -253,7 +253,7 @@ AZStd::vector<AZ::Vector3> TerrainSystem::GenerateInputPositionsFromRegion(
}
AZStd::vector<AZ::Vector3> TerrainSystem::GenerateInputPositionsFromListOfVector2(
const AZStd::span<AZ::Vector2>& inPositionsVec2) const
const AZStd::span<const AZ::Vector2> inPositionsVec2) const
{
AZStd::vector<AZ::Vector3> inPositions;
inPositions.reserve(inPositionsVec2.size());

@ -322,7 +322,7 @@ namespace Terrain
const AZ::Aabb& inRegion,
const AZ::Vector2& stepSize) const;
AZStd::vector<AZ::Vector3> GenerateInputPositionsFromListOfVector2(
const AZStd::span<AZ::Vector2>& inPositionsVec2) const;
const AZStd::span<const AZ::Vector2> inPositionsVec2) const;
// AZ::TickBus::Handler overrides ...
void OnTick(float deltaTime, AZ::ScriptTimePoint time) override;

Loading…
Cancel
Save