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
@@ -181,7 +181,6 @@ namespace EMotionFX
ASSERT_EQ(parameter->GetName(), boolParamPair.first.c_str());
MCore::Attribute* attribute = animGraphInstance->GetParameterValue(static_cast<AZ::u32>(parameterIndex.GetValue()));
const BoolParameter* boolParameter = static_cast<const BoolParameter*>(parameter);
MCore::AttributeBool* boolAttribute = static_cast<MCore::AttributeBool*>(attribute);
boolAttribute->SetValue(boolParamPair.second);
}
@@ -196,7 +195,6 @@ namespace EMotionFX
ASSERT_EQ(parameter->GetName(), std::get<0>(vec2ParamTuple).c_str());
MCore::Attribute* attribute = animGraphInstance->GetParameterValue(static_cast<AZ::u32>(parameterIndex.GetValue()));
const Vector2Parameter* vec2Parameter = static_cast<const Vector2Parameter*>(parameter);
MCore::AttributeVector2* vec2Attribute = static_cast<MCore::AttributeVector2*>(attribute);
vec2Attribute->SetValue(std::get<1>(vec2ParamTuple));
}
@@ -211,7 +209,6 @@ namespace EMotionFX
ASSERT_EQ(parameter->GetName(), floatParamPair.first.c_str());
MCore::Attribute* attribute = animGraphInstance->GetParameterValue(static_cast<AZ::u32>(parameterIndex.GetValue()));
const FloatParameter* floatParameter = static_cast<const FloatParameter*>(parameter);
MCore::AttributeFloat* floatAttribute = static_cast<MCore::AttributeFloat*>(attribute);
floatAttribute->SetValue(floatParamPair.second);
}