Merge branch 'development' into cmake/SPEC-7484

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

									
										Code/Editor/Util/EditorUtils.cpp
									
		+1
		-1
	
												View File
												
				@@ -234,7 +234,7 @@ namespace EditorUtils

				    AzWarningAbsorber::AzWarningAbsorber(const char* window)

				        : m_window(window)

				    AZ_POP_DISABLE_WARNING

				    { 

				    {

				        BusConnect();

				    }