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

Merge branch 'development' into cmake/SPEC-7484

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/Animation/SkeletonHierarchy.cpp
#	Code/Editor/Animation/SkeletonMapper.cpp
#	Code/Editor/Animation/SkeletonMapperOperator.cpp
#	Code/Editor/LogFile.cpp
#	Code/Editor/ResourceSelectorHost.cpp
#	Code/Editor/SettingsManager.cpp
#	Code/Editor/Util/EditorUtils.cpp
#	Code/Editor/Util/FileUtil.cpp
#	Code/Editor/Util/IXmlHistoryManager.h
#	Code/Editor/Util/ImageTIF.cpp
#	Code/Editor/Util/StringHelpers.cpp
#	Code/Editor/Util/XmlHistoryManager.cpp
#	Code/Editor/Util/XmlHistoryManager.h
This commit is contained in:
Esteban Papp
2021-08-06 10:08:37 -07:00
parent 03cf71b12d 9e0b8c564d
commit 6db7488939
252 changed files with 2886 additions and 1079 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/TrackView/TrackViewFindDlg.cpp
+2 -2
View File
@@ -24,13 +24,13 @@ AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
// CTrackViewFindDlg dialog
CTrackViewFindDlg::CTrackViewFindDlg(const char* title, QWidget* pParent /*=NULL*/)
CTrackViewFindDlg::CTrackViewFindDlg(const char* title, QWidget* pParent /*=nullptr*/)
: QDialog(pParent)
, ui(new Ui::TrackViewFindDlg)
{
setWindowTitle(title);
m_tvDlg = 0;
m_tvDlg = nullptr;
m_numSeqs = 0;
ui->setupUi(this);