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

Merge pull request #3160 from aws-lumberyard-dev/michabr/lyshine_sc_fix

Browse Source 
Fix script canvases not loading if on a UI canvas element
This commit is contained in:
Chris Galvan
2021-08-17 12:40:03 -05:00
committed by GitHub
parent 2b5f77683c 4e3ec08c6a
commit fa2fc03a25
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LyShine/Code/Source/UiCanvasFileObject.h
+2 -1
View File
@@ -24,7 +24,8 @@ public:
AZ_CLASS_ALLOCATOR(UiCanvasFileObject, AZ::SystemAllocator, 0);
AZ_RTTI(UiCanvasFileObject, "{1F02632F-F113-49B1-85AD-8CD0FA78B8AA}");
static UiCanvasFileObject* LoadCanvasFromStream(AZ::IO::GenericStream& stream, const AZ::ObjectStream::FilterDescriptor& filterDesc = AZ::ObjectStream::FilterDescriptor(AZ::ObjectStream::AssetFilterAssetTypesOnly<AZ::SliceAsset, AZ::ScriptAsset>));
// Load canvas from stream with an optional asset filter. No asset references are ignored by default
static UiCanvasFileObject* LoadCanvasFromStream(AZ::IO::GenericStream& stream, const AZ::ObjectStream::FilterDescriptor& filterDesc = AZ::ObjectStream::FilterDescriptor());
static void SaveCanvasToStream(AZ::IO::GenericStream& stream, UiCanvasFileObject* canvasFileObject);
static AZ::Entity* LoadCanvasEntitiesFromStream(AZ::IO::GenericStream& stream, AZ::Entity*& rootSliceEntity);