Merge branch 'main' of https://github.com/aws-lumberyard/o3de into ly-as-sdk/LYN-2948-phistere

This commit is contained in:
lumberyard-employee-dm
2021-05-25 23:48:55 -05:00
1623 changed files with 54998 additions and 47910 deletions
@@ -135,7 +135,7 @@ namespace AZ::SceneGenerationComponents
{
for (size_t controlPointIndex = 0; controlPointIndex < skinData.get().GetVertexCount(); ++controlPointIndex)
{
const int usedPointIndex = meshData->GetUsedPointIndexForControlPoint(aznumeric_caster(controlPointIndex));
const int usedPointIndex = meshData->GetUsedPointIndexForControlPoint(meshData->GetControlPointIndex(aznumeric_caster(controlPointIndex)));
const size_t linkCount = skinData.get().GetLinkCount(controlPointIndex);
if (usedPointIndex < 0 || linkCount == 0)