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

Merge remote-tracking branch 'upstream/development' into camera_and_editor_viewport_widget_improvements

Browse Source 
Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
This commit is contained in:
Yuriy Toporovskyy
2021-08-06 10:32:38 -04:00
parent 6e59b1f519 053c4af66d
commit fd616fdcfb
425 changed files with 2145 additions and 1758 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/TrackView/SequenceBatchRenderDialog.cpp
+7 -8
View File
@@ -122,8 +122,7 @@ CSequenceBatchRenderDialog::CSequenceBatchRenderDialog(float fps, QWidget* pPare
}
CSequenceBatchRenderDialog::~CSequenceBatchRenderDialog()
{
}
= default;
void CSequenceBatchRenderDialog::reject()
{
@@ -524,7 +523,7 @@ void CSequenceBatchRenderDialog::OnGo()
InitializeContext();
// Trigger the first item.
OnMovieEvent(IMovieListener::eMovieEvent_Stopped, NULL);
OnMovieEvent(IMovieListener::eMovieEvent_Stopped, nullptr);
}
}
@@ -733,7 +732,7 @@ bool CSequenceBatchRenderDialog::GetResolutionFromCustomResText(const char* cust
bool CSequenceBatchRenderDialog::LoadOutputOptions(const QString& pathname)
{
XmlNodeRef batchRenderOptionsNode = XmlHelpers::LoadXmlFromFile(pathname.toStdString().c_str());
if (batchRenderOptionsNode == NULL)
if (batchRenderOptionsNode == nullptr)
{
return true;
}
@@ -1399,7 +1398,7 @@ void CSequenceBatchRenderDialog::OnLoadBatch()
Path::GetUserSandboxFolder(), loadPath))
{
XmlNodeRef batchRenderListNode = XmlHelpers::LoadXmlFromFile(loadPath.toStdString().c_str());
if (batchRenderListNode == NULL)
if (batchRenderListNode == nullptr)
{
return;
}
@@ -1422,7 +1421,7 @@ void CSequenceBatchRenderDialog::OnLoadBatch()
// sequence
const QString seqName = itemNode->getAttr("sequence");
item.pSequence = GetIEditor()->GetMovieSystem()->FindLegacySequenceByName(seqName.toUtf8().data());
if (item.pSequence == NULL)
if (item.pSequence == nullptr)
{
QMessageBox::warning(this, tr("Sequence not found"), tr("A sequence of '%1' not found! This'll be skipped.").arg(seqName));
continue;
@@ -1439,7 +1438,7 @@ void CSequenceBatchRenderDialog::OnLoadBatch()
break;
}
}
if (item.pDirectorNode == NULL)
if (item.pDirectorNode == nullptr)
{
QMessageBox::warning(this, tr("Director node not found"), tr("A director node of '%1' not found in the sequence of '%2'! This'll be skipped.").arg(directorName).arg(seqName));
continue;
@@ -1552,7 +1551,7 @@ bool CSequenceBatchRenderDialog::SetUpNewRenderItem(SRenderItem& item)
break;
}
}
if (item.pDirectorNode == NULL)
if (item.pDirectorNode == nullptr)
{
return false;
}