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
@@ -59,7 +59,6 @@ namespace GradientSignal
{
behaviorContext->Class<MixedGradientLayer>()
->Constructor()
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::Preview)
->Attribute(AZ::Script::Attributes::Category, "Vegetation")
->Property("enabled", BehaviorValueProperty(&MixedGradientLayer::m_enabled))
->Property("mixingOperation",
@@ -156,7 +155,6 @@ namespace GradientSignal
if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
{
behaviorContext->Class<MixedGradientConfig>()
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::Preview)
->Attribute(AZ::Script::Attributes::Category, "Vegetation")
->Constructor()
->Method("GetNumLayers", &MixedGradientConfig::GetNumLayers)
@@ -202,7 +200,6 @@ namespace GradientSignal
behaviorContext->Class<MixedGradientComponent>()->RequestBus("MixedGradientRequestBus");
behaviorContext->EBus<MixedGradientRequestBus>("MixedGradientRequestBus")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::Preview)
->Attribute(AZ::Script::Attributes::Category, "Vegetation")
->Event("GetNumLayers", &MixedGradientRequestBus::Events::GetNumLayers)
->Event("AddLayer", &MixedGradientRequestBus::Events::AddLayer)
@@ -355,4 +352,4 @@ namespace GradientSignal
{
return m_configuration.GetLayer(layerIndex);
}
}
}