Merge branch 'development' into cmake/linux_fix_warn_unused

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

# Conflicts:
#	Code/Legacy/CrySystem/Log.cpp
#	Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.hxx
#	Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp
#	Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.cpp
#	Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.cpp

This commit is contained in:

Esteban Papp

2021-08-25 11:47:19 -07:00

parent cd5df6b372 b53182fdb6

commit 6b96be82ea

400 changed files with 1886 additions and 46899 deletions

									
										Code/Framework/AzFramework/AzFramework/Script/ScriptComponent.cpp
									
		+2
		
												View File
												
				@@ -33,6 +33,8 @@ extern "C" {

				#   include <Lua/lauxlib.h>

				}

				AZ_DEFINE_BUDGET(Script);

				namespace ScriptComponentCpp

				{

				    template<typename T>