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

clean up comments, add set type action in disabled form

Browse Source 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
This commit is contained in:
carlitosan
2022-01-14 12:46:08 -08:00
parent 02ce4659c4
commit 295c836ed8
6 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Slot.cpp
-1
View File
@@ -462,7 +462,6 @@ namespace ScriptCanvas
bool Slot::CanConvertToReference(bool isNewSlot) const
{
// #sc_user_slot_variable_ux make sure this can be converted to reference, or created as one
return (!m_isUserAdded || isNewSlot) && CanConvertTypes() && !m_isVariableReference && !m_node->HasConnectedNodes((*this));
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.cpp
+3 -3
View File
@@ -237,7 +237,7 @@ namespace ScriptCanvas
if (auto datum = variablePair.second.GetDatum())
{
// #sc_user_slot_variable_ux consider getting all variables from the UX variable manager, or from the ACM and looking them up in the variable manager for ordering
// #functions2 slot<->variable consider getting all variables from the UX variable manager, or from the ACM and looking them up in the variable manager for ordering
m_sourceVariableByDatum.insert(AZStd::make_pair(datum, &variablePair.second));
}
}
@@ -247,7 +247,7 @@ namespace ScriptCanvas
auto datum = sourceVariable->GetDatum();
AZ_Assert(datum != nullptr, "the datum must be valid");
// #sc_user_slot_variable_ux check to verify if it is a member variable
// #functions2 slot<->variable check to verify if it is a member variable
auto variable = sourceVariable->GetScope() == VariableFlags::Scope::Graph
? AddMemberVariable(*datum, sourceVariable->GetVariableName(), sourceVariable->GetVariableId())
: AddVariable(*datum, sourceVariable->GetVariableName(), sourceVariable->GetVariableId());
@@ -1670,7 +1670,7 @@ namespace ScriptCanvas
if (returnValue.second->m_source->m_sourceSlotId == slot->GetId())
{
// #sc_user_slot_variable_ux determine if the root or the function call should be passed in here...the slot/node lead to the user call on the thread, but it may not even be created yet
// #functions2 slot<->variable determine if the root or the function call should be passed in here...the slot/node lead to the user call on the thread, but it may not even be created yet
return AZStd::make_pair(root, returnValue.second->m_source);
}
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/GraphVariableManagerComponent.cpp
-1
View File
@@ -220,7 +220,6 @@ namespace ScriptCanvas
return AZ::Success(newId);
}
// #sc_user_slot_variable_ux add this to the graph, using the old datum
AZ::Outcome<VariableId, AZStd::string> GraphVariableManagerComponent::AddVariable(AZStd::string_view name, const Datum& value, bool functionScope)
{
if (FindVariable(name))