Integrating github/staging through commit ab87ed9
This commit is contained in:
@@ -144,7 +144,6 @@ namespace EMotionFX
|
||||
behaviorContext->Constant("InvalidParameterIndex", BehaviorConstant(static_cast<AZ::u32>(MCORE_INVALIDINDEX32)));
|
||||
|
||||
behaviorContext->EBus<AnimGraphComponentRequestBus>("AnimGraphComponentRequestBus")
|
||||
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::Preview)
|
||||
// General API
|
||||
->Event("FindParameterIndex", &AnimGraphComponentRequestBus::Events::FindParameterIndex)
|
||||
->Event("FindParameterName", &AnimGraphComponentRequestBus::Events::FindParameterName)
|
||||
@@ -192,7 +191,6 @@ namespace EMotionFX
|
||||
;
|
||||
|
||||
behaviorContext->EBus<AnimGraphComponentNetworkRequestBus>("AnimGraphComponentNetworkRequestBus")
|
||||
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::Preview)
|
||||
->Attribute(AZ::Script::Attributes::Category, "Animation")
|
||||
->Event("IsAssetReady", &AnimGraphComponentNetworkRequestBus::Events::IsAssetReady)
|
||||
->Event("HasSnapshot", &AnimGraphComponentNetworkRequestBus::Events::HasSnapshot)
|
||||
@@ -451,7 +449,6 @@ namespace EMotionFX
|
||||
AnimGraphInstancePostCreate();
|
||||
|
||||
// Apply parameter defaults.
|
||||
EMotionFX::AnimGraph* animGraph = cfg.m_animGraphAsset.Get()->GetAnimGraph();
|
||||
for (AZ::ScriptProperty* parameter : cfg.m_parameterDefaults.m_parameters)
|
||||
{
|
||||
const char* paramName = parameter->m_name.c_str();
|
||||
|
||||
Reference in New Issue
Block a user