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

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EditorPythonBindings/Code/Source/PythonProxyBus.cpp
+2 -1
View File
@@ -209,7 +209,9 @@ namespace EditorPythonBindings
if (eventName == e.m_name)
{
AZStd::string eventNameValue{ eventName };
#if defined(AZ_ENABLE_TRACING)
const auto& callbackIt = m_callbackMap.find(eventNameValue);
#endif
AZ_Warning("python", m_callbackMap.end() == callbackIt, "Replacing callback for eventName:%s", eventNameValue.c_str());
m_callbackMap[eventNameValue] = callback;
return true;
@@ -254,7 +256,6 @@ namespace EditorPythonBindings
const AZ::BehaviorEBusHandler::EventArray& events = m_handler->GetEvents();
for (int iEvent = 0; iEvent < static_cast<int>(events.size()); ++iEvent)
{
const AZ::BehaviorEBusHandler::BusForwarderEvent& e = events[iEvent];
m_handler->InstallGenericHook(iEvent, &PythonProxyNotificationHandler::OnEventGenericHook, this);
}
}
Gems/EditorPythonBindings/Code/Tests/PythonProxyBusTests.cpp
-1
View File
@@ -61,7 +61,6 @@ namespace UnitTest
if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
{
behaviorContext->Class<FakeComponentId>("FakeComponentId")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::Preview)
->Attribute(AZ::Script::Attributes::Storage, AZ::Script::Attributes::StorageType::Value)
->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
->Attribute(AZ::Script::Attributes::Module, "entity")