Esteban Papp 68b04fa6c1 Merge branch 'development' into cmake/AddressSanitizer ...

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

# Conflicts:
#	Code/Legacy/CryCommon/LegacyAllocator.h

2021-08-19 11:44:28 -07:00

..

Include/Config

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

Source

Merge branch 'development' into cmake/AddressSanitizer

2021-08-19 11:44:28 -07:00

Tests

Replace Array2D with vector<vector<>>

2021-07-20 09:43:14 -07:00

CMakeLists.txt

Add test for the mesh optimizer's ability to weld nearby vertices

2021-07-19 14:37:53 -07:00

sceneprocessing_editor_files.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

sceneprocessing_editor_static_files.cmake

Replace Array2D with vector<vector<>>

2021-07-20 09:43:14 -07:00

sceneprocessing_editor_tests_files.cmake

Add test for the mesh optimizer's ability to weld nearby vertices

2021-07-19 14:37:53 -07:00

sceneprocessing_files.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

sceneprocessing_tests_files.cmake

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00