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

Integrating up through commit 90f050496

Browse Source
This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotComponent.cpp
+11 -1
View File
@@ -36,12 +36,13 @@ namespace GraphCanvas
if (serializeContext)
{
serializeContext->Class<DataSlotComponent, SlotComponent>()
->Version(5)
->Version(6)
->Field("TypeId", &DataSlotComponent::m_dataTypeId)
->Field("DataSlotType", &DataSlotComponent::m_dataSlotType)
->Field("CanConvertSlotTypes", &DataSlotComponent::m_canConvertSlotTypes)
->Field("ContainedTypeIds", &DataSlotComponent::m_containedTypeIds)
->Field("DataValueType", &DataSlotComponent::m_valueType)
->Field("IsUserSlot", &DataSlotComponent::m_isUserSlot)
;
}
}
@@ -97,6 +98,7 @@ namespace GraphCanvas
, m_valueType(DataValueType::Primitive)
, m_dataTypeId(AZ::Uuid::CreateNull())
, m_previousDataSlotType(DataSlotType::Unknown)
, m_isUserSlot(false)
{
if (m_slotConfiguration.m_slotGroup == SlotGroups::Invalid)
{
@@ -112,6 +114,7 @@ namespace GraphCanvas
, m_dataTypeId(dataSlotConfiguration.m_typeId)
, m_containedTypeIds(dataSlotConfiguration.m_containerTypeIds)
, m_previousDataSlotType(DataSlotType::Unknown)
, m_isUserSlot(dataSlotConfiguration.m_isUserAdded)
{
if (m_slotConfiguration.m_slotGroup == SlotGroups::Invalid)
{
@@ -230,6 +233,8 @@ namespace GraphCanvas
slotConfiguration->m_containerTypeIds = m_containedTypeIds;
slotConfiguration->m_isUserAdded = m_isUserSlot;
PopulateSlotConfiguration((*slotConfiguration));
return slotConfiguration;
@@ -416,6 +421,11 @@ namespace GraphCanvas
}
}
bool DataSlotComponent::IsUserSlot() const
{
return m_isUserSlot;
}
const Styling::StyleHelper* DataSlotComponent::GetDataColorPalette() const
{
AZ::EntityId sceneId;