You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Esteban Papp f8e99cd7dd Merge branch 'development' into cmake/SPEC-2513_w4244 ... Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> # Conflicts: # Code/Editor/CryEditDoc.cpp # Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp # Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp # Gems/PhysXDebug/Code/Source/SystemComponent.cpp		5 years ago
..
Include/Config	Shorten copyright headers by splitting into 2 lines (#2213)	5 years ago
Source	Deprecate profiler categories based on global enum	5 years ago
Tests	Gems/SceneProcessing	5 years ago
CMakeLists.txt	Add test for the mesh optimizer's ability to weld nearby vertices	5 years ago
sceneprocessing_editor_files.cmake	Shorten copyright headers by splitting into 2 lines (#2213)	5 years ago
sceneprocessing_editor_static_files.cmake	Replace Array2D with vector<vector<>>	5 years ago
sceneprocessing_editor_tests_files.cmake	Add test for the mesh optimizer's ability to weld nearby vertices	5 years ago
sceneprocessing_files.cmake	Shorten copyright headers by splitting into 2 lines (#2213)	5 years ago
sceneprocessing_tests_files.cmake	Shorten copyright headers by splitting into 2 lines (#2213)	5 years ago