birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
bbe6ff7b905e1d6b02fd2bfd00d2aa9252bc60d8
o3de/Code/Tools/SceneAPI/SceneBuilder/Importers
T
History
Esteban Papp 2d1ed48fea Merge branch 'development' into cmake/SPEC-2513_w4018 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Gems/EMotionFX/Code/EMotionFX/Source/Actor.cpp
2021-08-10 11:45:02 -07:00
..
Utilities
fix w4018
2021-08-05 19:43:56 -07:00
AssImpAnimationImporter.cpp
updates after merging development
2021-08-05 19:44:03 -07:00
AssImpAnimationImporter.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AssImpBitangentStreamImporter.cpp
fix w4018
2021-08-05 19:43:56 -07:00
AssImpBitangentStreamImporter.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AssImpBlendShapeImporter.cpp
fix w4018
2021-08-05 19:43:56 -07:00
AssImpBlendShapeImporter.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AssImpBoneImporter.cpp
Updated skeleton logic: (#2957)
2021-08-10 06:47:14 -07:00
AssImpBoneImporter.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AssImpColorStreamImporter.cpp
fix w4018
2021-08-05 19:43:56 -07:00
AssImpColorStreamImporter.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AssImpImporterUtilities.cpp
Merge branch 'development' into cmake/SPEC-2513_w4018
2021-08-10 11:45:02 -07:00
AssImpImporterUtilities.h
AssImp skeleton import improvements (#2348)
2021-07-26 08:39:02 +02:00
AssImpMaterialImporter.cpp
fix w4018
2021-08-05 19:43:56 -07:00
AssImpMaterialImporter.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AssImpMeshImporter.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AssImpMeshImporter.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AssImpSkinImporter.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AssImpSkinImporter.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AssImpSkinWeightsImporter.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AssImpSkinWeightsImporter.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AssImpTangentStreamImporter.cpp
fix w4018
2021-08-05 19:43:56 -07:00
AssImpTangentStreamImporter.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AssImpTransformImporter.cpp
AssImp skeleton import improvements (#2348)
2021-07-26 08:39:02 +02:00
AssImpTransformImporter.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
AssImpUvMapImporter.cpp
fix w4018
2021-08-05 19:43:56 -07:00
AssImpUvMapImporter.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ImporterUtilities.cpp
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ImporterUtilities.h
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00
ImporterUtilities.inl
Shorten copyright headers by splitting into 2 lines (#2213)
2021-07-16 15:25:48 -07:00