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 9c7b55a31d Merge branch 'development' into cmake/linux_fix_warn_unused ... Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> # Conflicts: # Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Bits.h # Gems/Atom/RHI/Code/Include/Atom/RHI/IndexBufferView.h # Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp # Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp		4 years ago
..
MaterialAssetBuilderComponent.cpp	Changed MaterialConverterBus GetMaterialTypePath() to return a string instead of char*	4 years ago
MaterialAssetBuilderComponent.h	Added a new registry setting that disables automatic conversion of materials from model files like FBX.	4 years ago
ModelAssetBuilderComponent.cpp	Gems/Atom	4 years ago
ModelAssetBuilderComponent.h	Updated unit tests and fixed build failures.	4 years ago
ModelExporterComponent.cpp	Added a new registry setting that disables automatic conversion of materials from model files like FBX.	4 years ago
ModelExporterComponent.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
ModelExporterContexts.cpp	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
ModelExporterContexts.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago
MorphTargetExporter.cpp	Gems/Atom	4 years ago
MorphTargetExporter.h	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago