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
@@ -63,7 +63,6 @@ namespace Vegetation
if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
{
behaviorContext->Class<ScaleModifierConfig>()
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::Preview)
->Attribute(AZ::Script::Attributes::Category, "Vegetation")
->Constructor()
->Property("allowOverrides", BehaviorValueProperty(&ScaleModifierConfig::m_allowOverrides))
@@ -110,7 +109,6 @@ namespace Vegetation
behaviorContext->Class<ScaleModifierComponent>()->RequestBus("ScaleModifierRequestBus");
behaviorContext->EBus<ScaleModifierRequestBus>("ScaleModifierRequestBus")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::Preview)
->Attribute(AZ::Script::Attributes::Category, "Vegetation")
->Event("GetAllowOverrides", &ScaleModifierRequestBus::Events::GetAllowOverrides)
->Event("SetAllowOverrides", &ScaleModifierRequestBus::Events::SetAllowOverrides)
@@ -217,4 +215,4 @@ namespace Vegetation
{
return m_configuration.m_gradientSampler;
}
}
}