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

Merge pull request #5900 from aws-lumberyard-dev/fix_ghi5848_and_InstanceDataHierarchyEnumContainerTest

Browse Source 
Fix for GHI5848 and InstanceDataHierarchyEnumContainerTest
This commit is contained in:
jonawals
2021-11-24 18:29:14 +00:00
committed by GitHub
parent 562b876734 d75b6f9d64
commit 6f5f756d1d
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp
+2
View File
@@ -54,6 +54,7 @@
#include <AzToolsFramework/API/ComponentEntityObjectBus.h>
#include <AzToolsFramework/API/EditorCameraBus.h>
#include <AzToolsFramework/API/ViewPaneOptions.h>
#include <AzToolsFramework/API/ViewportEditorModeTrackerNotificationBus.h>
#include <AzToolsFramework/Entity/EditorEntitySearchComponent.h>
#include <AzToolsFramework/Entity/EditorEntitySortComponent.h>
#include <AzToolsFramework/Entity/EditorEntityModelComponent.h>
@@ -385,6 +386,7 @@ namespace AzToolsFramework
ComponentModeFramework::ComponentModeDelegate::Reflect(context);
ViewportInteraction::ViewportInteractionReflect(context);
ViewportEditorModeNotifications::Reflect(context);
Camera::EditorCameraRequests::Reflect(context);
AzToolsFramework::EditorTransformComponentSelectionRequests::Reflect(context);
Code/Framework/AzToolsFramework/Tests/InstanceDataHierarchy.cpp
+1 -1
View File
@@ -710,7 +710,7 @@ namespace UnitTest
auto getEnumData = [&ec](const AzToolsFramework::InstanceDataNode& node) -> Uuid
{
Uuid id;
Uuid id = Uuid::CreateNull();
auto attribute = node.GetElementMetadata()->FindAttribute(AZ_CRC("EnumType"));
auto attributeData = azrtti_cast<AttributeData<AZ::TypeId>*>(attribute);
if (attributeData)