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

ScriptCanvas

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
pappeste
2021-06-18 16:15:06 -07:00
committed by Esteban Papp
parent 41a1cb58cf
commit e3344bdf8d
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
+2 -2
View File
@@ -1384,7 +1384,7 @@ namespace ScriptCanvasEditor
AZStd::string assetPath = scriptCanvasAsset.GetAbsolutePath();
if (!assetPath.empty() && !m_loadingNewlySavedFile)
{
int eraseCount = m_loadingWorkspaceAssets.erase(fileAssetId);
const size_t eraseCount = m_loadingWorkspaceAssets.erase(fileAssetId);
if (eraseCount == 0)
{
@@ -2529,7 +2529,7 @@ namespace ScriptCanvasEditor
AZ::Data::AssetId fileAssetId = memoryAsset.GetFileAssetId();
AZ::Data::AssetId memoryAssetId = memoryAsset.GetId();
int eraseCount = m_loadingAssets.erase(fileAssetId);
size_t eraseCount = m_loadingAssets.erase(fileAssetId);
if (eraseCount > 0)
{
Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.cpp
+5 -5
View File
@@ -651,9 +651,9 @@ namespace ScriptCanvasEditor
return;
}
m_ui->tableWidget->insertRow(m_inspectedAssets);
m_ui->tableWidget->insertRow(static_cast<int>(m_inspectedAssets));
QTableWidgetItem* rowName = new QTableWidgetItem(tr(asset.GetHint().c_str()));
m_ui->tableWidget->setItem(m_inspectedAssets, ColumnAsset, rowName);
m_ui->tableWidget->setItem(static_cast<int>(m_inspectedAssets), static_cast<int>(ColumnAsset), rowName);
if (!graphComponent->GetVersion().IsLatest())
{
@@ -675,9 +675,9 @@ namespace ScriptCanvasEditor
AZ::SystemTickBus::ExecuteQueuedEvents();
});
m_ui->tableWidget->setCellWidget(m_inspectedAssets, ColumnAction, rowGoToButton);
m_ui->tableWidget->setCellWidget(static_cast<int>(m_inspectedAssets), static_cast<int>(ColumnAction), rowGoToButton);
m_ui->tableWidget->setCellWidget(m_inspectedAssets, ColumnStatus, spinner);
m_ui->tableWidget->setCellWidget(static_cast<int>(m_inspectedAssets), static_cast<int>(ColumnStatus), spinner);
}
QToolButton* browseButton = new QToolButton(this);
@@ -705,7 +705,7 @@ namespace ScriptCanvasEditor
connect(browseButton, &QPushButton::clicked, [absolutePath] {
AzQtComponents::ShowFileOnDesktop(absolutePath);
});
m_ui->tableWidget->setCellWidget(m_inspectedAssets, ColumnBrowse, browseButton);
m_ui->tableWidget->setCellWidget(static_cast<int>(m_inspectedAssets), static_cast<int>(ColumnBrowse), browseButton);
++m_inspectedAssets;
++m_currentAssetIndex;
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp
+1 -1
View File
@@ -699,7 +699,7 @@ namespace ScriptCanvas
ActivationData data(args.runtimeOverrides, storage);
ActivationInputRange range = Execution::Context::CreateActivateInputRange(data, args.executionState->GetEntityId());
PushActivationArgs(lua, range.inputs, range.totalCount);
return range.totalCount;
return static_cast<int>(range.totalCount);
}
int UnpackDependencyConstructionArgs(lua_State* lua)