birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge latest

Browse Source 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
This commit is contained in:
chcurran
2021-08-23 16:02:58 -07:00
parent 13188f8958 5a3c289fac
commit 794c22c02e
1126 changed files with 12630 additions and 13375 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ExpressionEvaluation/Code/Source/ExpressionEvaluationSystemComponent.cpp
+3 -2
View File
@@ -6,6 +6,7 @@
*
*/
#include <AzCore/Debug/Profiler.h>
#include <AzCore/Serialization/EditContext.h>
#include <AzCore/Serialization/EditContextConstants.inl>
#include <AzCore/Serialization/Json/RegistrationContext.h>
@@ -258,7 +259,7 @@ namespace ExpressionEvaluation
AZ::Outcome<void, ParsingError> ExpressionEvaluationSystemComponent::ParseRestrictedExpressionInPlace(const AZStd::unordered_set<ExpressionParserId>& parsers, AZStd::string_view expressionString, ExpressionTree& expressionTree) const
{
AZ_PROFILE_TIMER("ExpressionEvaluation", __FUNCTION__);
AZ_PROFILE_FUNCTION(ExpressionEvaluation);
expressionTree.ClearTree();
@@ -520,7 +521,7 @@ namespace ExpressionEvaluation
ExpressionResult ExpressionEvaluationSystemComponent::Evaluate(const ExpressionTree& expressionTree) const
{
AZ_PROFILE_TIMER("ExpressionEvaluation", __FUNCTION__);
AZ_PROFILE_FUNCTION(ExpressionEvaluation);
ExpressionResultStack resultStack;