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/EMotionFX/Code/Source/Integration/System/SystemComponent.cpp
-2
View File
@@ -400,7 +400,6 @@ namespace EMotionFX
// In order for a property to be displayed in ScriptCanvas. Both a setter and a getter are necessary(both must be non-null).
// This is being worked on in dragon branch, once this is complete the dummy lambda functions can be removed.
behaviorContext->Class<MotionEvent>("MotionEvent")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::Preview)
->Property("entityId", BehaviorValueGetter(&MotionEvent::m_entityId), [](MotionEvent*, const AZ::EntityId&) {})
->Property("parameter", BehaviorValueGetter(&MotionEvent::m_parameter), [](MotionEvent*, const char*) {})
->Property("eventType", BehaviorValueGetter(&MotionEvent::m_eventType), [](MotionEvent*, const AZ::u32&) {})
@@ -412,7 +411,6 @@ namespace EMotionFX
;
behaviorContext->EBus<ActorNotificationBus>("ActorNotificationBus")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::Preview)
->Handler<ActorNotificationBusHandler>()
->Event("OnMotionEvent", &ActorNotificationBus::Events::OnMotionEvent)
->Event("OnMotionLoop", &ActorNotificationBus::Events::OnMotionLoop)