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

SPEC-2513 Fixes to enable w4457

Browse Source
This commit is contained in:
Esteban Papp
2021-06-04 10:51:47 -07:00
committed by GitHub
parent aa700fc97f
commit 76a6df341b
23 changed files with 124 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp
+6 -6
View File
@@ -340,31 +340,31 @@ namespace
}
// Pass in the associated class data so we can do more intensive lookups?
const AZ::SerializeContext::ClassData* classData = serializeContext.FindClassData(node.first);
const AZ::SerializeContext::ClassData* nodeClassData = serializeContext.FindClassData(node.first);
if (classData == nullptr)
if (nodeClassData == nullptr)
{
continue;
}
// Detect primitive types os we avoid making nodes out of them.
// Or anything that is 'pure data' and should be populated through a different mechanism.
if (classData->m_azRtti && classData->m_azRtti->IsTypeOf<ScriptCanvas::PureData>())
if (nodeClassData->m_azRtti && nodeClassData->m_azRtti->IsTypeOf<ScriptCanvas::PureData>())
{
continue;
}
// Skip over some of our more dynamic nodes that we want to populate using different means
else if (classData->m_azRtti && classData->m_azRtti->IsTypeOf<ScriptCanvas::Nodes::Core::GetVariableNode>())
else if (nodeClassData->m_azRtti && nodeClassData->m_azRtti->IsTypeOf<ScriptCanvas::Nodes::Core::GetVariableNode>())
{
continue;
}
else if (classData->m_azRtti && classData->m_azRtti->IsTypeOf<ScriptCanvas::Nodes::Core::SetVariableNode>())
else if (nodeClassData->m_azRtti && nodeClassData->m_azRtti->IsTypeOf<ScriptCanvas::Nodes::Core::SetVariableNode>())
{
continue;
}
else
{
nodePaletteModel.RegisterCustomNode(categoryPath, node.first, node.second, classData);
nodePaletteModel.RegisterCustomNode(categoryPath, node.first, node.second, nodeClassData);
}
}
Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.cpp
+2 -2
View File
@@ -563,13 +563,13 @@ namespace ScriptCanvasEditor
else if (slotType == GraphCanvas::SlotTypes::DataSlot)
{
const AZ::EntityId& slotId2 = GetTargetId();
const GraphCanvas::GraphId& graphId = GetGraphId();
const GraphCanvas::GraphId& graphId2 = GetGraphId();
GraphCanvas::Endpoint endpoint;
GraphCanvas::SlotRequestBus::EventResult(endpoint, slotId2, &GraphCanvas::SlotRequests::GetEndpoint);
bool promotedElement = false;
GraphCanvas::GraphModelRequestBus::EventResult(promotedElement, graphId, &GraphCanvas::GraphModelRequests::PromoteToVariableAction, endpoint);
GraphCanvas::GraphModelRequestBus::EventResult(promotedElement, graphId2, &GraphCanvas::GraphModelRequests::PromoteToVariableAction, endpoint);
if (promotedElement)
{