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

Merge pull request #4034 from aws-lumberyard-dev/carlitosan/development

Browse Source 
remove false error from deserializing BC nodes
This commit is contained in:
carlitosan
2021-09-09 17:43:18 -07:00
committed by GitHub
parent 3a4937456a e3d007319d
commit c3e285cff7
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp
+1 -1
View File
@@ -610,7 +610,7 @@ namespace ScriptCanvas
void EBusEventHandler::OnDeserialize() void EBusEventHandler::OnDeserialize()
{ {
AZStd::lock_guard<AZStd::recursive_mutex> lock(m_mutex); AZStd::lock_guard<AZStd::recursive_mutex> lock(m_mutex);
if (!m_ebus) if (!m_ebus && !m_ebusName.empty())
{ {
CreateHandler(m_ebusName); CreateHandler(m_ebusName);
} }
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.cpp
+25 -17
View File
@@ -769,27 +769,30 @@ namespace ScriptCanvas
{ {
AZStd::lock_guard<AZStd::recursive_mutex> lock(m_mutex); AZStd::lock_guard<AZStd::recursive_mutex> lock(m_mutex);
m_warnOnMissingFunction = true; if (!m_lookupName.empty() || !m_className.empty())
const AZ::BehaviorClass* bcClass{}; {
const AZ::BehaviorMethod* method{}; m_warnOnMissingFunction = true;
EventType eventType; const AZ::BehaviorClass* bcClass{};
const AZ::BehaviorMethod* method{};
EventType eventType;
if (GetBehaviorContextClassMethod(m_lookupName, bcClass, method, eventType)) if (GetBehaviorContextClassMethod(m_lookupName, bcClass, method, eventType))
{
m_eventType = eventType;
ConfigureMethod(*method, bcClass);
}
else
{
if (!m_method)
{ {
AZ_Warning("ScriptCanvas", !m_warnOnMissingFunction, "method node failed to deserialize properly"); m_eventType = eventType;
ConfigureMethod(*method, bcClass);
}
else
{
if (!m_method)
{
AZ_Warning("ScriptCanvas", !m_warnOnMissingFunction, "method node failed to deserialize properly");
}
} }
}
if (m_resultSlotIDs.empty()) if (m_resultSlotIDs.empty())
{ {
m_resultSlotIDs.emplace_back(SlotId{}); m_resultSlotIDs.emplace_back(SlotId{});
}
} }
Node::OnDeserialize(); Node::OnDeserialize();
@@ -798,6 +801,11 @@ namespace ScriptCanvas
#if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)//// #if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)////
void Method::OnWriteEnd() void Method::OnWriteEnd()
{ {
if (m_lookupName.empty() && m_className.empty())
{
return;
}
OnDeserialize(); OnDeserialize();
} }
#endif//defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED) #endif//defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)