Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -64,7 +64,6 @@ namespace Vegetation
        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
        {
            behaviorContext->Class<AreaDebugConfig>()
-                ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::Preview)
                ->Attribute(AZ::Script::Attributes::Category, "Vegetation")
                ->Constructor()
                ->Property("DebugColor", BehaviorValueProperty(&AreaDebugConfig::m_debugColor))
@@ -171,4 +170,4 @@ namespace Vegetation
    {
        return m_hasBlendedDebugDisplayData ? m_blendedDebugDisplayData : GetBaseDebugDisplayData();
    }
-}
+}
@@ -819,7 +819,8 @@ namespace DebugUtility
                        0.0f,
                        "Unfiltered");
                    AZ::IO::LocalFileIO::GetInstance()->Write(logHandle, buffer, written);
-                    for (const auto& filterReason : usedfilterReasonSet)
+                    const size_t usedfilterReasonSetSize = usedfilterReasonSet.size();
+                    for (size_t i = 0; i < usedfilterReasonSetSize; ++i)
                    {
                        written = azsnprintf(buffer, AZ_ARRAY_SIZE(buffer), " 0,");
                        AZ::IO::LocalFileIO::GetInstance()->Write(logHandle, buffer, written);