Integrating latest 47acbe8

This commit is contained in:
alexpete
2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
@@ -23,7 +23,6 @@ namespace AZ
{
namespace Containers
{
size_t RuleContainer::GetRuleCount() const
{
return m_rules.size();
@@ -57,6 +56,13 @@ namespace AZ
}
void RuleContainer::InsertRule(const AZStd::shared_ptr<DataTypes::IRule>& rule, size_t position)
{
AZ_Assert(AZStd::find(m_rules.begin(), m_rules.end(), rule) == m_rules.end(), "Unable to insert rule as it has already been added.");
m_rules.insert(m_rules.begin() + position, rule);
}
void RuleContainer::RemoveRule(size_t index)
{
if (index < m_rules.size())
@@ -76,7 +82,6 @@ namespace AZ
}
}
void RuleContainer::Reflect(ReflectContext* context)
{
SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
@@ -156,4 +161,4 @@ namespace AZ
} // Containers
} // SceneAPI
} // AZ
} // AZ