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

Merge pull request #2059 from aws-lumberyard-dev/michabr/lyshine_bus_fix

Browse Source 
Fix bus assert in LyShine
This commit is contained in:
Chris Galvan
2021-07-12 14:11:03 -05:00
committed by GitHub
parent 2fad7f37db 5fe980edf1
commit 2af23649b1
2 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LyShine/Code/Source/LyShineSystemComponent.cpp
-2
View File
@@ -148,7 +148,6 @@ namespace LyShine
{
LyShineAllocatorScope::ActivateAllocators();
LyShineRequestBus::Handler::BusConnect();
UiSystemBus::Handler::BusConnect();
UiSystemToolsBus::Handler::BusConnect();
UiFrameworkBus::Handler::BusConnect();
@@ -196,7 +195,6 @@ namespace LyShine
UiSystemBus::Handler::BusDisconnect();
UiSystemToolsBus::Handler::BusDisconnect();
UiFrameworkBus::Handler::BusDisconnect();
LyShineRequestBus::Handler::BusDisconnect();
CrySystemEventBus::Handler::BusDisconnect();
LyShineAllocatorScope::DeactivateAllocators();
Gems/LyShine/Code/Source/LyShineSystemComponent.h
-2
View File
@@ -13,7 +13,6 @@
#include <LmbrCentral/Rendering/MaterialAsset.h>
#include <LyShine/LyShineBus.h>
#include <LyShine/Bus/UiSystemBus.h>
#include <LyShine/Bus/UiCanvasManagerBus.h>
#include <LyShine/Bus/Tools/UiSystemToolsBus.h>
@@ -28,7 +27,6 @@ namespace LyShine
class LyShineSystemComponent
: public AZ::Component
, protected LyShineRequestBus::Handler
, protected UiSystemBus::Handler
, protected UiSystemToolsBus::Handler
, protected LyShineAllocatorScope