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

Merge pull request #4334 from aws-lumberyard-dev/carlitosan/bugfix

Browse Source 
Remove false error for lookup on methods
This commit is contained in:
carlitosan
2021-09-27 10:24:40 -07:00
committed by GitHub
parent 96fed44fe8 c14133e926
commit 6614b9a3d9
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.cpp
+9 -5
View File
@@ -652,8 +652,13 @@ namespace ScriptCanvas
return {};
}
bool Method::GetBehaviorContextClassMethod(const AZStd::string&, const AZ::BehaviorClass*& outClass, const AZ::BehaviorMethod*& outMethod, EventType& outType) const
bool Method::GetBehaviorContextClassMethod(const AZ::BehaviorClass*& outClass, const AZ::BehaviorMethod*& outMethod, EventType& outType) const
{
if (m_lookupName.empty() && m_className.empty())
{
return false;
}
AZStd::string prettyClassName;
AZStd::string methodName = m_lookupName;
@@ -749,15 +754,14 @@ namespace ScriptCanvas
AZStd::tuple<const AZ::BehaviorMethod*, MethodType, EventType, const AZ::BehaviorClass*> Method::LookupMethod() const
{
using TupleType = AZStd::tuple<const AZ::BehaviorMethod*, MethodType, EventType, const AZ::BehaviorClass*>;
AZStd::string methodName = m_lookupName;
AZStd::string prettyClassName;
const AZ::BehaviorClass* bcClass{};
const AZ::BehaviorMethod* method{};
EventType eventType;
if (GetBehaviorContextClassMethod(m_lookupName, bcClass, method, eventType))
if (GetBehaviorContextClassMethod(bcClass, method, eventType))
{
return TupleType{ method, m_methodType, eventType, bcClass };
}
@@ -776,7 +780,7 @@ namespace ScriptCanvas
const AZ::BehaviorMethod* method{};
EventType eventType;
if (GetBehaviorContextClassMethod(m_lookupName, bcClass, method, eventType))
if (GetBehaviorContextClassMethod(bcClass, method, eventType))
{
m_eventType = eventType;
ConfigureMethod(*method, bcClass);
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.h
+1 -1
View File
@@ -168,7 +168,7 @@ namespace ScriptCanvas
AZ_INLINE void SetWarnOnMissingFunction(bool enabled) { m_warnOnMissingFunction = enabled; }
bool GetBehaviorContextClassMethod(const AZStd::string& name, const AZ::BehaviorClass*& outClass, const AZ::BehaviorMethod*& outMethod, EventType& outType) const;
bool GetBehaviorContextClassMethod(const AZ::BehaviorClass*& outClass, const AZ::BehaviorMethod*& outMethod, EventType& outType) const;
private:
friend struct ScriptCanvas::BehaviorContextMethodHelper;