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 68b04fa6c1 Merge branch 'development' into cmake/AddressSanitizer ... Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> # Conflicts: # Code/Legacy/CryCommon/LegacyAllocator.h		4 years ago
..
MeshBuilder.cpp	Deprecate profiler categories based on global enum	4 years ago
MeshBuilder.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
MeshBuilderInvalidIndex.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
MeshBuilderSkinningInfo.cpp	Replace Array2D with vector<vector<>>	4 years ago
MeshBuilderSkinningInfo.h	[MeshOptimizer] Return the correct size from the position map when there are blendshapes (#2391)	4 years ago
MeshBuilderSubMesh.cpp	missing header includes	4 years ago
MeshBuilderSubMesh.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
MeshBuilderVertexAttributeLayers.cpp	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
MeshBuilderVertexAttributeLayers.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
MeshOptimizerComponent.cpp	Skip blend shapes that influence multiple meshes (#3009)	4 years ago
MeshOptimizerComponent.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago