diff --git a/Tools/CMake/libraries/assimp.cmake b/Tools/CMake/libraries/assimp.cmake
index 58ea5f2b7..e15687721 100644
--- a/Tools/CMake/libraries/assimp.cmake
+++ b/Tools/CMake/libraries/assimp.cmake
@@ -22,10 +22,9 @@
 
 project(assimp)
 
-addPath("${libDir}/assimp/code")
+addPathRec("${libDir}/assimp/code")
 addPath("${libDir}/assimp/code/Importer")
 addPath("${libDir}/assimp/contrib")
-
 addPath("${libDir}/assimp/contrib/clipper")
 addPath("${libDir}/assimp/contrib/irrXML")
 addPath("${libDir}/assimp/contrib/Open3DGC")
@@ -39,14 +38,89 @@ addPath("${libDir}/assimp/contrib/utf8cpp")
 addPath("${libDir}/assimp/contrib/zip")
 addPath("${libDir}/zlib") #use T3D's included
 
-#addDef(ASSIMP_BUILD_NO_GLTF_IMPORTER)
-addDef(ASSIMP_BUILD_NO_C4D_IMPORTER)
-addDef(ASSIMP_BUILD_NO_IFC_IMPORTER)
-addDef(ASSIMP_BUILD_NO_OPENGEX_IMPORTER)
-addDef(ASSIMP_BUILD_NO_IRRMESH_IMPORTER)
-addDef(ASSIMP_BUILD_NO_IRR_IMPORTER)
 addDef(ASSIMP_BUILD_NO_OWN_ZLIB)
+
+#   Disable all exporters, none should be needed but functionality
+#   is there if needed later on in development
+#   Specifically the export as DAE functionality already enabled in engine
+
+addDef(ASSIMP_BUILD_NO_EXPORT)
+
+#   Some Common file format imports NOT disabled
+#addDef(ASSIMP_BUILD_NO_GLTF_IMPORTER)
+#addDef(ASSIMP_BUILD_NO_FBX_IMPORTER)
+#addDef(ASSIMP_BUILD_NO_MS3D_IMPORTER)
+#addDef(ASSIMP_BUILD_NO_OBJ_IMPORTER)
+#addDef(ASSIMP_BUILD_NO_LWO_IMPORTER)
+
+
+#   List of Importers to enable imporing of a specific file type
+#   add a # to comment out the line.
+addDef(ASSIMP_BUILD_NO_3DS_IMPORTER)
+addDef(ASSIMP_BUILD_NO_3MF_IMPORTER)
+addDef(ASSIMP_BUILD_NO_AC_IMPORTER)
+addDef(ASSIMP_BUILD_NO_AMF_IMPORTER)
+addDef(ASSIMP_BUILD_NO_ASE_IMPORTER)
+addDef(ASSIMP_BUILD_NO_ASSBIN_IMPORTER)
+addDef(ASSIMP_BUILD_NO_B3D_IMPORTER)
+addDef(ASSIMP_BUILD_NO_BLEND_IMPORTER)
+addDef(ASSIMP_BUILD_NO_BVH_IMPORTER)
+addDef(ASSIMP_BUILD_NO_C4D_IMPORTER)
+addDef(ASSIMP_BUILD_NO_COB_IMPORTER)
+addDef(ASSIMP_BUILD_NO_COLLADA_IMPORTER)
+addDef(ASSIMP_BUILD_NO_CSM_IMPORTER)
+addDef(ASSIMP_BUILD_NO_DXF_IMPORTER)
+addDef(ASSIMP_BUILD_NO_HMP_IMPORTER)
+addDef(ASSIMP_BUILD_NO_IFC_IMPORTER)
 addDef(ASSIMP_BUILD_NO_STEP_IMPORTER)
+addDef(ASSIMP_BUILD_NO_IRR_IMPORTER)
+addDef(ASSIMP_BUILD_NO_IRRMESH_IMPORTER)
+addDef(ASSIMP_BUILD_NO_LWS_IMPORTER)
+addDef(ASSIMP_BUILD_NO_M3D_IMPORTER)
+addDef(ASSIMP_BUILD_NO_MD2_IMPORTER)
+addDef(ASSIMP_BUILD_NO_MD3_IMPORTER)
+addDef(ASSIMP_BUILD_NO_MD5_IMPORTER)
+addDef(ASSIMP_BUILD_NO_MDC_IMPORTER)
+addDef(ASSIMP_BUILD_NO_MDL_IMPORTER)
+addDef(ASSIMP_BUILD_NO_MMD_IMPORTER)
+addDef(ASSIMP_BUILD_NO_NDO_IMPORTER)
+addDef(ASSIMP_BUILD_NO_NFF_IMPORTER)
+addDef(ASSIMP_BUILD_NO_OFF_IMPORTER)
+addDef(ASSIMP_BUILD_NO_OGRE_IMPORTER)
+addDef(ASSIMP_BUILD_NO_OPENGEX_IMPORTER)
+addDef(ASSIMP_BUILD_NO_PLY_IMPORTER)
+addDef(ASSIMP_BUILD_NO_Q3BSP_IMPORTER)
+addDef(ASSIMP_BUILD_NO_Q3D_IMPORTER)
+addDef(ASSIMP_BUILD_NO_RAW_IMPORTER)
+addDef(ASSIMP_BUILD_NO_SIB_IMPORTER)
+addDef(ASSIMP_BUILD_NO_SMD_IMPORTER)
+addDef(ASSIMP_BUILD_NO_STL_IMPORTER)
+addDef(ASSIMP_BUILD_NO_TERRAGEN_IMPORTER)
+addDef(ASSIMP_BUILD_NO_3D_IMPORTER)
+addDef(ASSIMP_BUILD_NO_X_IMPORTER)
+addDef(ASSIMP_BUILD_NO_X3D_IMPORTER)
+addDef(ASSIMP_BUILD_NO_XGL_IMPORTER)
+
+#   ALL exporters are disabled at the start of the definition blocks
+#   if you want to disable only specific file types 
+#   comment out the "addDef(ASSIMP_BUILD_NO_EXPORT)" higher in this text
+
+#addDef(ASSIMP_BUILD_NO_3DS_EXPORTER)
+#addDef(ASSIMP_BUILD_NO_3MF_EXPORTER)
+#addDef(ASSIMP_BUILD_NO_ASSBIN_EXPORTER)
+#addDef(ASSIMP_BUILD_NO_ASSJSON_EXPORTER)
+#addDef(ASSIMP_BUILD_NO_ASSXML_EXPORTER)
+#addDef(ASSIMP_BUILD_NO_COLLADA_EXPORTER)
+#addDef(ASSIMP_BUILD_NO_FBX_EXPORTER)
+#addDef(ASSIMP_BUILD_NO_GLTF_EXPORTER)
+#addDef(ASSIMP_BUILD_NO_M3D_EXPORTER)
+#addDef(ASSIMP_BUILD_NO_OBJ_EXPORTER)
+#addDef(ASSIMP_BUILD_NO_OPENGEX_EXPORTER)
+#addDef(ASSIMP_BUILD_NO_PLY_EXPORTER)
+#addDef(ASSIMP_BUILD_NO_STEP_EXPORTER)
+#addDef(ASSIMP_BUILD_NO_STL_EXPORTER)
+#addDef(ASSIMP_BUILD_NO_X_EXPORTER)
+#addDef(ASSIMP_BUILD_NO_X3D_EXPORTER)
 
 addInclude(${libDir}/assimp)
 addInclude(${libDir}/assimp/include/)