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

finish last of pre-PR clean up, including saving over previsouly opened tabs

Browse Source 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
This commit is contained in:
chcurran
2021-12-02 09:17:05 -08:00
parent 5da820a8c2
commit 5a0ab6814d
5 changed files with 154 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilder.cpp
+23 -13
View File
@@ -20,6 +20,7 @@ namespace BuildVariableOverridesCpp
{
enum Version
{
Original = 1,
EditorAssetRedux,
// add description above
@@ -30,19 +31,29 @@ namespace BuildVariableOverridesCpp
( AZ::SerializeContext& serializeContext
, AZ::SerializeContext::DataElementNode& rootElement)
{
// #sc_editor_asset
ScriptCanvasBuilder::BuildVariableOverrides overrides;
overrides.m_source = SourceHandle(nullptr, assetHolder.GetAssetId().m_guid, {});
for (auto& variable : editableData.GetVariables())
if (rootElement.GetVersion() < BuildVariableOverridesCpp::Version::EditorAssetRedux)
{
overrides.m_overrides.push_back(variable.m_graphVariable);
}
if (!rootElement.AddElementWithData(serializeContext, "runtimeDataOverrides", overrides))
{
AZ_Error("ScriptCanvas", false, "EditorScriptCanvasComponent conversion failed: failed to add 'runtimeDataOverrides'");
return false;
auto sourceIndex = rootElement.FindElement(AZ_CRC_CE("source"));
if (sourceIndex == -1)
{
AZ_Error("ScriptCanvas", false, "BuildVariableOverrides coversion failed: 'source' was missing");
return false;
}
auto& sourceElement = rootElement.GetSubElement(sourceIndex);
AZ::Data::Asset<ScriptCanvasEditor::ScriptCanvasAsset> asset;
if (!sourceElement.GetData(asset))
{
AZ_Error("ScriptCanvas", false, "BuildVariableOverrides coversion failed: could not retrieve 'source' data");
return false;
}
ScriptCanvasEditor::SourceHandle sourceHandle(nullptr, asset.GetId().m_guid, {});
if (!rootElement.AddElementWithData(serializeContext, "source", sourceHandle))
{
AZ_Error("ScriptCanvas", false, "BuildVariableOverrides coversion failed: could not add updated 'source' data");
return false;
}
}
return true;
@@ -136,7 +147,6 @@ namespace ScriptCanvasBuilder
return m_variables.empty() && m_entityIds.empty() && m_dependencies.empty();
}
// #sc_editor_asset THIS MUST GET VERSIONED!
void BuildVariableOverrides::Reflect(AZ::ReflectContext* reflectContext)
{
if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(reflectContext))