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

Merge branch 'development' into cmake/warn_virtual

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-09-10 20:27:01 -07:00
parent 5ce7b76ca5 72cd282ad2
commit 5965760612
156 changed files with 35196 additions and 34784 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()
{
AZStd::lock_guard<AZStd::recursive_mutex> lock(m_mutex);
if (!m_ebus)
if (!m_ebus && !m_ebusName.empty())
{
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);
m_warnOnMissingFunction = true;
const AZ::BehaviorClass* bcClass{};
const AZ::BehaviorMethod* method{};
EventType eventType;
if (!m_lookupName.empty() || !m_className.empty())
{
m_warnOnMissingFunction = true;
const AZ::BehaviorClass* bcClass{};
const AZ::BehaviorMethod* method{};
EventType eventType;
if (GetBehaviorContextClassMethod(m_lookupName, bcClass, method, eventType))
{
m_eventType = eventType;
ConfigureMethod(*method, bcClass);
}
else
{
if (!m_method)
if (GetBehaviorContextClassMethod(m_lookupName, bcClass, method, eventType))
{
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())
{
m_resultSlotIDs.emplace_back(SlotId{});
if (m_resultSlotIDs.empty())
{
m_resultSlotIDs.emplace_back(SlotId{});
}
}
Node::OnDeserialize();
@@ -798,6 +801,11 @@ namespace ScriptCanvas
#if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)////
void Method::OnWriteEnd()
{
if (m_lookupName.empty() && m_className.empty())
{
return;
}
OnDeserialize();
}
#endif//defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)