Fix warnings from sonarcube.

MD5: Fix uninitialized pointer dereference for file with invalid vertex index (#6439 )
A segmentation fault occurred while parsing an MD5 file that contains an invalid vertex index. The issue was caused by mScene->mMaterials not being kept in sync with mScene->mNumMaterials. As a result, the aiScene destructor could call delete on uninitialized pointers. This patch ensures that mScene->mNumMaterials always matches the actual contents of the mScene->mMaterials array. That way, if an exception is thrown during file import, delete is only called for properly allocated aiMaterial objects.
2026-01-13 00:07:15 +01:00 · 2026-01-12 15:08:31 +01:00 · 2026-01-09 11:02:21 +01:00 · 2026-01-09 08:59:22 +01:00 · 2026-01-07 10:50:12 +01:00 · 2026-01-03 22:32:33 +01:00
74 changed files with 5046 additions and 2468 deletions
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -48,7 +48,7 @@ jobs:
    - name: ccache
      uses: hendrikmuhs/ccache-action@v1.2
      
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
      with:
          submodules: true
          
@@ -65,7 +65,7 @@ jobs:
    - name: Cache DX SDK
      id: dxcache
      if: contains(matrix.name, 'windows')
-      uses: actions/cache@v4
+      uses: actions/cache@v5
      with:
        path: '${{ github.workspace }}/DX_SDK'
        key: ${{ runner.os }}-DX_SDK
@@ -109,7 +109,7 @@ jobs:
      run: cd build/bin && ./unit ${{ steps.hunter_extra_test_args.outputs.args }}
      shell: bash

-    - uses: actions/upload-artifact@v5
+    - uses: actions/upload-artifact@v6
      if: matrix.name == 'windows-msvc'
      with:
        name: 'assimp-bins-${{ matrix.name }}'
@@ -141,7 +141,7 @@ jobs:
          prerelease: true
      - run: |
          echo '${{steps.create-release.outputs.upload_url}}' > release_upload_url.txt
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
        with:
          name: create-release
          path: release_upload_url.txt
@@ -188,7 +188,7 @@ jobs:
      - id: upload-url
        run: |
          echo "url=$(cat create-release/release_upload_url.txt)" >> $GITHUB_OUTPUT
-      - uses: actions/download-artifact@v6
+      - uses: actions/download-artifact@v7
        with:
          name: 'assimp-bins-${{ matrix.name }}-${{ github.sha }}'
      - uses: actions/upload-release-asset@v1
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -27,7 +27,7 @@ jobs:
            os: ubuntu-latest

    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6

      - uses: lukka/get-cmake@latest

--- a/.github/workflows/cifuzz.yml
+++ b/.github/workflows/cifuzz.yml
@@ -19,7 +19,7 @@ jobs:
        dry-run: false
        language: c++
    - name: Upload Crash
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
      if: failure() && steps.build.outcome == 'success'
      with:
        name: artifacts
--- a/.github/workflows/sanitizer.yml
+++ b/.github/workflows/sanitizer.yml
@@ -14,7 +14,7 @@ jobs:
    name: adress-sanitizer
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
    - uses: lukka/get-cmake@latest    
    - uses: lukka/set-shell-env@v1
      with:
@@ -38,7 +38,7 @@ jobs:
    name: undefined-behavior-sanitizer
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
    - uses: lukka/get-cmake@latest    
    - uses: lukka/set-shell-env@v1
      with:
@@ -62,7 +62,7 @@ jobs:
    name: printf-sanitizer
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
    
    - name: run scan_printf script
      run: ./scripts/scan_printf.sh
--- a/607
+++ b/607
@@ -1,607 +0,0 @@
----------------------------------------------------------------------
-CHANGELOG
----------------------------------------------------------------------
-4.1.0 (2017-12):
- FEATURES:
- - Export 3MF ( experimental )
- - Import / Export glTF 2
- - Introduce new zib-lib to eb able to export zip-archives
- FIXES/HOUSEKEEPING:
- - Added missing include to stdlib.h and remove load library call
- - Fix install for builds with MSVC compiler and NMake.
- - Update list of supported file formats.
- - Add TriLib to the official list of supported ports.
- - Re-enabling PACK_STRUCT for MDL files.
- - Use std.::unique_ptr
- - Update D3MFExporter.h
- - Update MD3Loader.cpp, using index
- - Fix all warnings on MSVC14
- - Copy assimp dll to unit folder on windows
- - Update jvm port supported formats
- - Add support for building Mac OS X Framework bundles
- - Check for nullptr dereferencing before copying scene data
- - Update ValidateDataStructure.h, typo
- - Enable data structure validation in cases where it doesn't cause failures
- - Remove some dead assignments
- - fast_atof: Silence some uninitialized variable warnings
- - Check for area test if the face is a triangle.
- - Set mNumUVComponents to 0 when deleting texture coordinate sets
- - Only scale the root node because this will rescale all children nodes as well.
- - Issue 1514: Fix frame pointer arithmetic
- - Prevent failing stringstream to crash the export process
- - powf -> pow
- - add Defines.h to include folder for install.
- - Android:
-  - Fix android build
-  - Fix assimp for cross compile for android
-  - Use define for D_FILE_OFFSET_BITS only for not-android systems.
- - FBX:
-  - Fix handling with embedded textures
-  - FBX 7500 Binary reading
-  - Remove dead assignment
-  - Fix export of deleted meshes; Add LazyDict::Remove method
-  - Log an error instead of letting the fbx-importer crash. ( issue 213 )
-  - Replace bad pointer casting with memcpy
-  - Remove useless const qualifier from return value
-  - Add explicit instantiation of log_prefix so other FBX source files can see it
-  - add missing inversion of postrotation matrix for fbx.
-  - FIReader: Silence uninitialized variable warning
-  - Update version check in FBX reader to check for version >= 7500
-  - Use actual min/max of anim keys when start/stop time is missing
- GLTF1:
- - Fix output of glTF 1 version string
- - Fix delete / delete[] mismatch in glTFAsset
- - Don’t ignore rgba(1,1,1,1) color properties
- - glTF2 primitives fixes
- - Don’t ignore rgba(1,1,1,1) color properties
- - Fix delete / delete[] mismatch in glTFAsset
- - Remove KHR_binary_glTF code
- - glTF nodes can only hold one mesh. this simply assigns to and check’s a Node’s Mesh
- - version in glb header is stored as uint32_t
- GLTF2:
- - node name conflict fix
- - Fix transform matrices multiplication order
- - Preserve node names when importing
- - Add support for tangents in import
- - Fix typo on gltf2 camera parameters
- - Moved byteStride from accessor to bufferView
- - Implemented reading binary glTF2 (glb) files
- - Fix signed/unsigned warning
- - Add postprocess step for scaling
- - Fix shininess to roughness conversion
- - Prefer “BLEND” over “MASK” as an alphaMode default
- - Approximate specularity / glossiness in metallicRoughness materials
- - Diffuse color and diffuse texture import and export improvements
- - Addressed some mismatched news/deletes caused by the new glTF2 sources.
- - Fix delete / delete[] mismatches in glTF2 importer
- - use correct name of exporter to gltf2
- - Fix possible infinite loop when exporting to gltf2
- - Fix glTF2::Asset::FindUniqueID() when the input string is >= 256 chars
- - Fix glTF2 alphaMode storage and reading
- - Fix glTF 2.0 multi-primitive support
- - Load gltf .bin files from correct directory
- - Add support for importing both glTF and glTF2 files
- - ampler improvements; Add new LazyDict method
- - Changes to GLTF2 materials
- - Remove Light, Technique references
- - Start removing materials common, and adding pbrSpecularGlossiness
- - Use !ObjectEmpty() vs. MemberCount() > 0
- - Working read, import, export, and write of gltf2 (pbr) material
- - Check in gltf2 models to test directory
- - Remove un-needed test models
- - Start managing and importing gltf2 pbr materials
- - Update glTF2 Asset to use indexes
- - Duplicate gltfImporter as gltf2Importer; Include glTF2 importer in CMake List
- - glTF2: Fix animation export
- - use opacity for diffuse alpha + alphaMode
- STL:
- - Restore import of multi mesh binary STLs
- Blender:
- - Silence warning about uninitialized member
- MDLImporter:
- - Don't take address of packed struct member
- assimp_cmd:
- - Fix strict-aliasing warnings
- Open3DGC:
- - Fix strict-aliasing warnings
- - Add assertions to silence static analyzer warnings
- - Remove redundant const qualifiers from return types
- - Fix some uninitialized variable warnings
- - Remove OPEN3DGC and compression references
- unzip:
- - Remove dead assignment
- - Bail on bad compression method
- - Fix possibly uninitialized variables
- clipper:
- - Add assertion to silence a static analyzer warning
- OpenDDLExport:
- - Reduce scope of a variable
- - Remove dead variable
- - Remove dead assignment
- - Fix another potential memory leak
- X3DImporter:
- - Add assertions to silence static analyzer warnings
- - Add missing unittest
- - Workaround for buggy Android NDK (issue #1361)
- TerragenLoader:
- - Remove unused variable
- SIBImporter:
- - Add assertions to silence static analyzer warnings
- IFC:
- - Remove dead code
- - Add explicit instantiation of log_prefix so IFCMaterial.cpp can see it
- PLY:
- - Remove dead assignment and reduce scope of a variable
- - fix vertex attribute lookup.
- OpenGEX:
- - Add assertion to silence a static analyzer warning
- - Fix for TextureFile with number in file name
- - Return early when element is TextureFile
- NFF:
- - Add assertions to silence static analyzer warnings
- - Split up some complicated assignments
- Raw: Fix misleading indentation warning
- - Reduce scope of a variable
- LWO
- - Reduce scope of a variable
- IRRLoader:
- - Fix confusing boolean casting
- AssbinExporter:
- - Add assertion to silence a static analyzer warning
- ASE:
- - Add assertion to silence a static analyzer warning
- AMFImporter:
- - Add assertion to silence a static analyzer warning
- - Add a block
- OptimizeGraph:
- - Fix possible null pointer dereference
- - RemoveRedundantMaterials:
- - Add assertion to silence a static analyzer warning
- ImproveCacheLocality:
- - Add assertion to silence a static analyzer warning
- RemoveRedundantMaterials:
- - Set pointer to nullptr after deleting it
- Travis:
- - Disable unit tests in scan-build config
- - Move slower builds earlier to improve parallelization
- - Add static analysis to build
- - Remove unused branch rule for travis.
- - Add Clang UBSan build configuration
- - Treat warnings as errors, without typos this time
- Unittests:
- - Add VS-based source groups for the unittests.
- Collada:
- - export <library_animations> tag
- - Update ColladaExporter.cpp
- - Silence uninitialized variable warning
- - Add support for line strip primitives
- Obj Wavefront:
- - check in exporting against out-of-bounds-access .
- - Issue 1351: use correct name for obj-meshname export for groups.
- - fix mem-lead: face will be not released in case of an error.
- - Anatoscope obj exporter nomtl
- - Raise exception when obj file contains invalid face indices
- - Added alternative displacement texture token in OBJ MTL material.
- - Obj: rename attribute from exporter.
- - Fix OBJ discarding all material names if the material library is missing
- Step:
- - use correct lookup for utf32
- MD2:
- - Fix MD2 frames containing garbage
- STL
- - add missing const.
- - Fix memory-alignment bug.
- - Fix issue 104: deal with more solids in one STL file.
- CMake
- - Fix issue 213: use correct include folder for assimp
- Doxygen
- - Fix issue 1513: put irrXML onto exclucde list for doxygen run
- PyAssimp:
- - Search for libassimp.so in LD_LIBRARY_PATH if available.
- - Fix operator precedence issue in header check
- - Split setup.py into multiple lines
- - Detect if Anaconda and fixed 3d_viewer for Python 3
- - created a python3 version of the 3dviewer and fixed the / = float in py3
- Blender:
- - Fix invalid access to mesh array when the array is empty.
- - Fix short overflow.
- - Silence warning about inline function which is declared but not defined
- JAssimp
- - Changed license header for IHMC contributions from Apache 2.0 to BSD
- - Add Node metadata to the Jassmip Java API
- - Added supported for custom IO Systems in Java. Implemented ClassLoader IO System
- - Added a link to pure jvm assimp port
- Clang sanitizer:
- - Undefined Behavior sanitizer
- - Fixed a divide by zero error in IFCBoolean that was latent, but nevertheless a bug
- B3DImporter:
- - Replace bad pointer casting with memcpy
- AppVeyor:
- - Cleanup and Addition of VS 2017 and running Tests
- - Fixed File Size reported as 0 in tests that use temporary files
- - x86 isn't a valid VS platform. Win32 it is, then.
- - Replaced the worker image name, which doesn't work as generator name, with a manually created generator name.
- - Cleaned up appveyor setup, added VS 2017 to the build matrix and attempted to add running of tests.
- - Treat warnings as errors on Appveyor
- - Disable warning 4351 on MSVC 2013
- OpenGEXImporter:
- - Copy materials to scene
- - Store RefInfo in unique_ptr so they get automatically cleaned up
- - Fix IOStream leak
- - Store ChildInfo in unique_ptr so they get automatically cleaned up
- - improve logging to be able to detect error-prone situations.
-  AMFImporter:
- - Fix memory leak
- UnrealLoader:
- - Fix IOStream leak
- Upgrade RapidJSON to get rid of a clang warning
- zlib:
- - Update zlib contribution
- - Removed unnecessary files from zlib contribution
- - Replaced unsigned long for the crc table to z_crc_t, to match what is returned by get-crc_table
- MakeVerboseFormat:
-  - Fix delete / delete[] mismatches in MakeVerboseFormat
- MaterialSystem:
- - Fix out-of-bounds read in MaterialSystem unit test
- SIB:
- - Added support for SIB models from Silo 2.5
- AssbinExporter:
- - Fix strict aliasing violation
- - Add Write specialization for aiColor3D
- DefaultLogger:
- - Whitespace cleanup to fix GCC misleading indentation warning
- MDP:
- - Fix encoding issues.
- - PreTransformVertices:
- - fix name lost in mesh and nodes when load with flag
- C4D:
- - Fixes for C4D importer
- Unzip:
- - Latest greatest.
-
-4.0.1 (2017-07-28)
-    - FIXES/HOUSEKEEPING:
-    - fix version test.
-    - Not compiling when using ASSIMP_DOUBLE_PRECISION
-    - Added support for python3
-    - Check if cmake is installed with brew
-    - Low performance in OptimizeMeshesProcess::ProcessNode with huge numbers of meshes
-    - Elapsed seconds not shown correctly
-    - StreamReader: fix out-of-range exception
-    - PPdPmdParser: fix compilation for clang
-
-
-4.0.0 (2017-07-18)
-
-FEATURES:
-    - Double precision support provided ( available via cmake option )
-	- QT-Widget based assimp-viewer ( works for windows, linux, osx )
-	- Open3DGC codec supported by glFT-importer
-	- glTF: Read and write transparency values
-	- Add Triangulate post-processing step to glTF exporters
-	- Update rapidjson to v1.0.2
-	- Added method to append new metadata to structure
-	- Unittests: intoduce a prototype model differ
-	- X3D support
-	- AMF support
-	- Lugdunum3D support
-	- Obj-Importer: obj-homogeneous_coords support
-	- Obj-Importer: new streaming handling
-	- Added support for 64 bit version header introduced in FbxSdk2016
-	- Travis: enable coverall support.
-	- PyAssimp: New version of the pyASSIMP 3D viewer, with much improved 3D controls
-    - Morph animation support for collada
-	- Added support for parameters Ni and Tf in OBJ/MTL file format
-	- aiScene: add method to add children
-	- Added new option to IFC importer to control tessellation angle + removed unused IFC option
-	- aiMetaData: introduce aiMetaData::Dealloc
-	- Samples: add a DX11 example
-	- travis ci: test on OXS ( XCode 6.3 ) as well
-	- travis ci: enable sudo support.
-	- openddlparser: integrate release v0.4.0
-	- aiMetaData: Added support for metadata in assbin format
-
-FIXES/HOUSEKEEPING:
-    - Introduce usage of #pragma statement
-	- Put cmake-scripts into their own folder
-	- Fix install pathes ( issue 938 )
-	- Fix object_compare in blender importer( issue 946 )
-	- Fix OSX compilation error
-	- Fix unzip path when no other version was found ( issue 967 )
-	- Set _FILE_OFFSET_BITS=64 for 32-bit linux ( issue 975 )
-	- Fix constructor for radjson on OSX
-	- Use Assimp namespace to fix build for big-endian architectures
-	- Add -fPIC to C Flags for 64bit linux Shared Object builds
-	- MDLLoader: fix resource leak.
-	- MakeVerboseFormat: fix invalid delete statement
-	- IFC: fix possible use after free access bug
-	- ComputeUVMappingprocess: add missing initialization for scalar value
-    - Fix invalid release of mat + mesh
-	- IrrImporter: Fix release functions
-	- Split mesh before exporting gltf ( issue 995 )
-	- 3MFImporter: add source group for visual studio
-	- IFC: Switch generated file to 2 files to fix issue related to <mingw4.9 ( Thanks Qt! )
-	- ObjImporter: fix test for vertices import
-    - export scene combiner ( issues177 )
-	- FBX: make lookup test less strict ( issues 994 )
-	- OpenGEX-Importer: add import of vertex colors ( issue 954 )
-	- fix bug when exporting mRotationKeys data
-	- fix mingw build (mingw supports stat64 nowadays)
-	- cfileio: fix leaks by not closing files in the destructor
-	- Fix OBJ parser mtllib statement parsing bug.
-	- Q3BSP-Importer: remove dead code
-	- Fix BlenderDNA for clang cross compiler.
-	- ScenePreprocessor: fix invalid index counter.
-	- Fix compiler warnings ( issue 957 )
-	- Fix obj .mtl file loading
-	- Fixed a compile error on MSVC14 x64 caused by the /bigobj flag failing to be set for the 1 and 2-suffixed versions introduced in commit 0a25b076b8968b7ea2aa96d7d1b4381be2d72ce6
-	- Fixed build warnings on MSVC14 x64
-	- Remove scaling of specular exponent in OBJFileImporter.cpp
-	- use ai_assert instead of assert ( issue 1076 )
-	- Added a preprocessor definition for MSVC to silence safety warnings regarding C library functions. This addresses all warnings for MSVC x86 and x64 when building zlib, tools and viewer as a static lib
-	- fix parsing of texture name ( issue 899 )
-	- add warning when detecting invalid mat definition ( issue 1111 )
-	- copy aiTexture type declaration instead of using decltype for declaration to fix iOS build( issue 1101 )
-	- FBX: Add additional material properties
-	- FBX: Correct camera position and clip planes
-    - FBX: Add correct light locations and falloff values
-	- fix typo ( issue 1141 )
-	- Fix collada export. Don't duplicate TEXCOORD/NORMALS/COLORS in <vertices> and <polylist> ( issue 1084 )
-	- OBJParser: set material index when changing current material
-	- OBJ: check for null mesh before updating material index
-	- add vertex color export support ( issue 809 )
-	- Fix memory leak in Collada importer ( issue 1169 )
-	- add stp to the list of supported extensions for step-files ( issue 1183 )
-	- fix clang build ( Issue-1169 )
-	- fix for FreeBSD
-	- Import FindPkgMacros to main CMake Configuration
-	- Extended support for tessellation parameter to more IFC shapes
-	- defensice handling of utf-8 decode issues ( issue 1211 )
-	- Fixed compiler error on clang 4.0 running on OSX
-	- use test extension for exported test files ( issue 1228 )
-	- Set UVW index material properties for OBJ files
-	- Fixed no member named 'atop' in global namespace issue for Android NDK compilation
-	- Apply mechanism to decide use for IrrXML external or internal
-	- Fix static init ordering bug in OpenGEX importer
-	- GLTF exporter: ensure animation accessors have same count
-	- GLTF exporter: convert animation time from ticks to seconds
-	- Add support for reading texture coordinates from PLY meshes with properties named 'texture_u' and 'texture_v'
-	- Added TokensForSearch in BlenderLoader to allow CanRead return true for in-memory files.
-	- fix wrong delete ( issue 1266 )
-	- OpenGEX: fix invalid handling with color4 token ( issue 1262 )
-	- LWOLoader: fix link in loader description
-	- Fix error when custom CMAKE_C_FLAGS is specified
-	- Fast-atof: log overflow errors
-	- Obj-Importer: do not break when detecting an overflow ( issue 1244 )
-	- Obj-Importer: fix parsing of multible line data definitions
-	- Fixed bug where IFC models with multiple IFCSite only loaded 1 site instead of the complete model
-	- PLYImporter: - optimize memory and speed on ply importer / change parser to use a file stream - manage texture path in ply
-	  import - manage texture coords on faces in ply import - correction on point cloud faces generation
-	- Utf8: integrate new lib ( issue 1158 )
-	- fixed CMAKE_MODULE_PATH overwriting previous values
-	- OpenGEX: Fixed bug in material color processing ( issue 1271 )
-	- SceneCombiner: move header for scenecombiner to public folder.
-	- GLTF exporter: ensure buffer view byte offsets are correctly aligned
-	- X3D importer: Added EXPORT and IMPORT to the list of ignored XML tags
-    - X3D Exporter: fixed missing attributes
-    - X3D importer: Fixed import of normals for the single index / normal per vertex case
-    - X3D importer: Fixed handling of inlined files
-    - X3D importer: fixed whitespace handling (issue 1202)
-	- X3D importer: Fixed iterator on MSVC 2015
-    - X3D importer: Fixed problems with auto, override and regex on older compilers
-    - X3D importer: Fixed missing header file
-    - X3D importer: Fixed path handling
-	- X3D importer: Implemented support for binary X3D files
-    - fix build without 3DS ( issue 1319 )
-	- pyassimp: Fixed indices for IndexedTriangleFanSet, IndexedTriangleSet and IndexedTriangleStripSet
-	- Fixes parameters to pyassimp.load
-	- Obj-Importe: Fixed texture bug due simultaneously using 'usemtl' and 'usemap' attributes
-	- check if all exporters are disabled ( issue 1320 )
-	- Remove std functions deprecated by C++11.
-	- X-Importer: make it deal with lines
-	- use correct path for compilers ( issue 1335 )
-	- Collada: add workaround to deal with polygon with holes
-	- update python readme
-	- Use unique node names when loading Collada files
-	- Fixed many FBX bugs
-
-API COMPATIBILITY:
-    - Changed ABI-compatibility to v3.3.1, please rebuild your precompiled libraries ( see issue 1182 )
-	- VS2010 outdated
-
-3.3.1 (2016-07-08)
-
-FIXES/HOUSEKEEPING:
-    - Setup of default precision for 17 exporters
-    - Fix xcode project files
-    - Fix BlenderTesselator: offsetof operator
-    - Invalid version in cmake file
-    - Update pstdint.h to latest greatest
-
-
-3.3.0 (2016-07-05)
-
-FEATURES:
-    - C++11 support enabled
-    - New regression-test-UI
-    - Experimental glTF-importer support
-    - OpenGEX: add support for cameras and lights
-    - C4D: update to latest Melange-SDK
-    - Add a gitter channel
-    - Coverity check enabled
-    - Switch to <...> include brackets for public headers
-    - Enable export by pyAssimp
-    - CI: check windows build
-    - Add functionality to perform a singlepost-processing step
-    - many more, just check the history
-
-FIXES/HOUSEKEEPING:
-    - Fix of many resource leaks in unittests and main lib
-    - Fix iOS-buildfor X64
-    - Choosing zlib manually for cmake
-    - many more, just check the history
-
-
-3.2.1 (2016-010-10)
-
-FEATURES:
-  - Updated glTF exporter to meet 1.0 specification.
-
-FIXES/HOUSEKEEPING:
-  - Fixed glTF Validator errors for exported glTF format.
-
-ISSUES:
-  - Hard coded sampler setting for
-    - magFilter
-    - minFilter
-  - void* in ExportData for accessor max and min.
-
-
-3.2.0 (2015-11-03)
-
-FEATURES:
-  - OpenDDL-Parser is part of contrib-source.
-  - Experimental OpenGEX-support
-  - CI-check for linux and windows
-  - Coverity check added
-  - New regression testsuite.
-
-FIXES/HOUSEKEEPING:
-  - Hundreds of bugfixes  in all parts of the library
-  - Unified line endings
-
-
-API COMPATIBILITY:
-  - Removed precompiled header to increase build speed for linux
-
-
-3.1.1 (2014-06-15)
-
-FEATURES:
-   - Support for FBX 2013 and newer, binary and ASCII (this is partly
-     work from Google Summer of Code 2012)
-   - Support for OGRE binary mesh and skeleton format
-   - Updated BLEND support for newer Blender versions
-   - Support for arbitrary meta data, used to hold FBX and DAE metadata
-   - OBJ Export now produces smaller files
-   - Meshes can now have names, this is supported by the major importers
-   - Improved IFC geometry generation
-   - M3 support has been removed
-
-FIXES/HOUSEKEEPING:
-    - Hundreds of bugfixes in all parts of the library
-    - CMake is now the primary build system
-
-API COMPATIBILITY:
-    - 3.1.1 is not binary compatible to 3.0 due to aiNode::mMetaData
-      and aiMesh::mName
-    - Export interface has been cleaned up and unified
-    - Other than that no relevant changes
-
-
-3.0 (2012-07-07)
-
-FEATURES:
-   - new export interface similar to the import API.
-   - Supported export formats: Collada, OBJ, PLY and STL
-   - added new import formats: XGL/ZGL, M3 (experimental)
-   - new postprocessing steps: Debone
-   - vastly improved IFC (Industry Foundation Classes) support
-   - introduced API to query importer meta information (such as supported
-       format versions, full name, maintainer info).
-   - reworked Ogre XML import
-   - C-API now supports per-import properties
-
-FIXES/HOUSEKEEPING:
-
-   - hundreds of bugfixes in all parts of the library
-   - unified naming and cleanup of public headers
-   - improved CMake build system
-   - templatized math library
-   - reduce dependency on boost.thread, only remaining spot
-     is synchronization for the C logging API
-
-API COMPATIBILITY:
-   - renamed headers, export interface, C API properties and meta data
-     prevent compatibility with code written for 2.0, but in
-     most cases these can be easily resolved
-   - Note: 3.0 is not binary compatible with 2.0
-
-
-2.0 (2010-11-21)
-
-FEATURES:
-   - Add support for static Blender (*.blend) scenes
-   - Add support for Q3BSP scenes
-   - Add a windows-based OpenGL sample featuring texturing & basic materials
-   - Add an experimental progress feedback interface.
-   - Vastly improved performance (up to 500%, depending on mesh size and
-     spatial structure) in some expensive postprocessing steps
-   - AssimpView now uses a reworked layout which leaves more space
-     to the scene hierarchy window
-
-   - Add C# bindings ('Assimp.NET')
-   - Keep BSD-licensed and otherwise free test files in separate
-     folders (./test/models and ./test/models-nonbsd).
-
-FIXES:
-   - Many Collada bugfixes, improve fault tolerance
-   - Fix possible crashes in the Obj loader
-   - Improve the Ogre XML loader
-   - OpenGL-sample now works with MinGW
-   - Fix Importer::FindLoader failing on uppercase file extensions
-   - Fix flawed path handling when locating external files
-   - Limit the maximum number of vertices, faces, face indices and
-     weights that Assimp is able to handle. This is to avoid
-     crashes due to overflowing counters.
-
-   - Updated XCode project files
-   - Further CMAKE build improvements
-
-
-API CHANGES:
-   - Add data structures for vertex-based animations (These are not
-     currently used, however ...)
-   - Some Assimp::Importer methods are const now.
-
-
-1.1 (2010-04-17)
-This is the list of relevant changes from the 1.0 (r412) release to 1.1 (r700).
-
-FEATURES:
-  - Vastly improved Collada support
-  - Add MS3D (Milkshape 3D) support
-  - Add support for Ogre XML static meshes
-  - Add experimental COB (TrueSpace) support
-  - Automatic test suite to quickly locate regressions
-  - D bindings (`dAssimp`)
-  - Python 2.n bindings (`PyAssimp`)
-  - Add basic support for Unicode input files (utf8, utf16 and utf32)
-  - Add further utilities to the `assimp` tool (xml/binary dumps, quick file stats)
-  - Switch to a CMAKE-based build system including an install target for unix'es
-  - Automatic evaluation of subdivision surfaces for some formats.
-  - Add `Importer::ReadFileFromMemory` and the corresponding C-API `aiReadFileFromMemory`
-  - Expose further math utilities via the C-API (i.e. `aiMultiplyMatrix4`)
-
-  - Move noboost files away from the public include directory
-  - Many, many bugfixes and improvements in existing loaders and postprocessing steps
-  - Documentation improved and clarified in many places.
-  - Add a sample on using Assimp in conjunction with OpenGL
-
-  - Distribution/packaging: comfortable SDK installer for Windows
-  - Distribution/packaging: improved release packages for other architectures
-
-CRITICAL FIXES:
-  - Resolve problems with clashing heap managers, STL ABIs and runtime libraries (win32)
-  - Fix automatic detection of file type if no file extension is given
-  - Improved exception safety and robustness, prevent leaking of exceptions through the C interface
-  - Fix possible heap corruption due to material properties pulled in incorrectly
-  - Avoid leaking in certain error scenarios
-  - Fix 64 bit compatibility problems in some loaders (i.e. MDL)
-
-BREAKING API CHANGES:
-  - None -
-
-MINOR API BEHAVIOUR CHANGES:
- - Change quaternion orientation to suit to the more common convention (-w).
- - aiString is utf8 now. Not yet consistent, however.
--- a/CHANGES.md
+++ b/CHANGES.md
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -362,7 +362,7 @@ ELSEIF(MSVC)
  elseif((GENERATOR_IS_MULTI_CONFIG) OR (CMAKE_BUILD_TYPE MATCHES Release))
    message("-- MSVC PDB generation disabled. Release binary will not be debuggable.")
  endif()
-  if(NOT /utf-8 IN_LIST CMAKE_CXX_FLAGS)
+  if(NOT CMAKE_CXX_FLAGS MATCHES "/utf-8")
    # Source code is encoded in UTF-8
    ADD_COMPILE_OPTIONS(/source-charset:utf-8)
  endif()
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -1,17 +1,53 @@
 {
-    "version": 3,
-    "cmakeMinimumRequired": {
-        "major": 3,
-        "minor": 20,
-        "patch": 0
+  "version": 3,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 20,
+    "patch": 0
+  },
+  "configurePresets": [
+    {
+      "name": "assimp",
+      "binaryDir": "${sourceDir}",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "ASSIMP_BUILD_ASSIMP_TOOLS": "OFF"
+      }
    },
-    "configurePresets": [
-        {
-            "name": "assimp_with_tools",
-            "binaryDir": "${sourceDir}",
-            "cacheVariables": {
-                "ASSIMP_BUILD_ASSIMP_TOOLS" : "ON"
-            }
-        }
-    ]
+    {
+      "name": "assimp_static",
+      "binaryDir": "${sourceDir}",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "BUILD_SHARED_LIBS": "OFF",
+        "ASSIMP_BUILD_ASSIMP_TOOLS": "OFF",
+        "ASSIMP_DOUBLE_PRECISION": "ON"
+      }
+    },
+    {
+      "name": "assimp_double_precision",
+      "binaryDir": "${sourceDir}",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "ASSIMP_BUILD_ASSIMP_TOOLS": "OFF",
+        "ASSIMP_DOUBLE_PRECISION": "ON"
+      }
+    },
+    {
+      "name": "assimp_with_tools",
+      "binaryDir": "${sourceDir}",
+      "cacheVariables": {
+        "ASSIMP_BUILD_ASSIMP_TOOLS": "ON"
+      }
+    },
+    {
+      "name": "assimp_all",
+      "binaryDir": "${sourceDir}",
+      "cacheVariables": {
+        "ASSIMP_BUILD_ASSIMP_TOOLS": "ON",
+        "ASSIMP_BUILD_SAMPLES": "ON",
+        "ASSIMP_BUILD_DOCS": "ON"
+      }
+    }
+  ]
 }
--- a/Readme.md
+++ b/Readme.md
@@ -3,7 +3,7 @@ Open Asset Import Library (assimp)

 Open Asset Import Library is a library that loads various 3D file formats into a shared, in-memory format. It supports more than __40 file formats__ for import and a growing selection of file formats for export.

-### Current project status ###
+### Current project status
 ![C/C++ CI](https://github.com/assimp/assimp/workflows/C/C++%20CI/badge.svg)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/9973693b7bdd4543b07084d5d9cf4745)](https://www.codacy.com/gh/assimp/assimp/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=assimp/assimp&amp;utm_campaign=Badge_Grade)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=assimp_assimp&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=assimp_assimp)
@@ -16,32 +16,32 @@ Open Asset Import Library is a library that loads various 3D file formats into a
 APIs are provided for C and C++. Various bindings exist to other languages (C#, Java, Python, Delphi, D). Assimp also runs on Android and iOS.
 Additionally, assimp features various __mesh post-processing tools__: normals and tangent space generation, triangulation, vertex cache locality optimization, removal of degenerate primitives and duplicate vertices, sorting by primitive type, merging of redundant materials and many more.

-## Project activity ##
+## Project activity
 ![Alt](https://repobeats.axiom.co/api/embed/997f84e5f9fcf772da1e687f3a4f3a8afdbf4cf0.svg "Repobeats analytics image")

-### Documentation ###
+### Documentation
 Read [our latest documentation](https://the-asset-importer-lib-documentation.readthedocs.io/en/latest/).

-### Pre-built binaries ###
+### Pre-built binaries
 Download binaries from [our Itch Projectspace](https://kimkulling.itch.io/the-asset-importer-lib).

-### Test data ###
+### Test data
 Clone [our model database for testing purposes](https://github.com/assimp/assimp-mdb).

-### Communities ###
+### Communities
 - Ask questions at [the Assimp Discussion Board](https://github.com/assimp/assimp/discussions).
 - Find us on [discord](https://discord.gg/kKazXMXDy2)
 - Ask [the Assimp community on Reddit](https://www.reddit.com/r/Assimp/).
 - Ask on [StackOverflow with the assimp-tag](http://stackoverflow.com/questions/tagged/assimp?sort=newest).
 - Nothing has worked? File a question or an issue report at [The Assimp-Issue Tracker](https://github.com/assimp/assimp/issues)

-#### Supported file formats ####
+#### Supported file formats
 See [the complete list of supported formats](https://github.com/assimp/assimp/blob/master/doc/Fileformats.md).

-### Building ###
+### Building
 Start by reading [our build instructions](https://github.com/assimp/assimp/blob/master/Build.md). We are available in vcpkg, and our build system is CMake; if you used CMake before there is a good chance you know what to do.

-### Ports ###
+### Ports
 * [Android](port/AndroidJNI/README.md)
 * [Python](port/PyAssimp/README.md)
 * [.NET](https://github.com/Saalvage/AssimpNetter)
@@ -54,35 +54,39 @@ Start by reading [our build instructions](https://github.com/assimp/assimp/blob/
 * [HAXE-Port](https://github.com/longde123/assimp-haxe) The Assimp-HAXE-port.
 * [Rust](https://github.com/jkvargas/russimp)

-### Other tools ###
+### Other tools
 [Qt5-ModelViewer](https://github.com/sharjith/ModelViewer-Qt5) is a powerful viewer based on Qt5 and Assimp's import and export abilities.<br>
 [Assimp-Viewer](https://github.com/assimp/assimp_view) is an experimental implementation for an Asset-Viewer based on ImGUI and Assimp (experimental).

 #### Repository structure ####
 Open Asset Import Library is implemented in C++. The directory structure looks like this:

-	/code		Source code
-	/contrib	Third-party libraries
-	/doc		Documentation (Doxygen source and pre-compiled docs)
-	/fuzz       Contains the test code for the Google Fuzzer project
-	/include	Public header C and C++ header files
-	/scripts 	Scripts are used to generate the loading code for some formats
-	/port		Ports to other languages and scripts to maintain those.
-	/test		Unit- and regression tests, test suite of models
-	/tools		Tools (old assimp viewer, command line `assimp`)
-	/samples	A small number of samples to illustrate possible use cases for Assimp
+```txt
+code				Source code
+├── AssetLib/		The asset-importer and exporter lib
+├── CApi/			C-API files
+├── Common/			Common code used from all modules
+├── Geometry/		Geometry utilities
+├── Material/		Common materials
+├── Pbrt/			Physical based materials
+├── PostProcessing/	Post-processing steps
+├── res				Resouce files
+contrib				Third-party libraries
+doc					Documentation (Doxygen source and pre-compiled docs)
+fuzz       			Contains the test code for the Google Fuzzer project
+include				Public header C and C++ header files
+scripts 			Scripts are used to generate the loading code for some formats
+port				Ports to other languages and scripts to maintain those.
+test				Unit- and regression tests, test suite of models
+├── headercheck		Implements headerchecks
+├── models-nonbsd	Non-BSP licensed headers
+├── models			BSP-licensed models
+├── unit			Unit tests
+tools				Tools (old assimp viewer, command line `assimp`)
+samples				Small number of samples to illustrate possible use cases for Assimp
+```
+### Contributing

-The source code is organized in the following way:
-
-	code/Common			        The base implementation for importers and the infrastructure
-	code/CApi                   Special implementations which are only used for the C-API
-	code/Geometry               A collection of geometry tools
-	code/Material               The material system
-	code/PBR                    An exporter for physical-based models
-	code/PostProcessing		    The post-processing steps
-	code/AssetLib/<FormatName>	Implementation for import and export of the format
-
-### Contributing ###
 We would greatly appreciate for you to contribute to assimp. The easiest way to get involved is to submit
 a pull request with your changes against the main repository's `master` branch.

--- a/cmake-modules/FindDevIL.cmake
+++ b/cmake-modules/FindDevIL.cmake
@@ -1,72 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#.rst:
-# FindDevIL
-# ---------
-#
-#
-#
-# This module locates the developer's image library.
-# http://openil.sourceforge.net/
-#
-# This module sets:
-#
-# ::
-#
-#    IL_LIBRARIES -   the name of the IL library. These include the full path to
-#                     the core DevIL library. This one has to be linked into the
-#                     application.
-#    ILU_LIBRARIES -  the name of the ILU library. Again, the full path. This
-#                     library is for filters and effects, not actual loading. It
-#                     doesn't have to be linked if the functionality it provides
-#                     is not used.
-#    ILUT_LIBRARIES - the name of the ILUT library. Full path. This part of the
-#                     library interfaces with OpenGL. It is not strictly needed
-#                     in applications.
-#    IL_INCLUDE_DIR - where to find the il.h, ilu.h and ilut.h files.
-#    IL_FOUND -       this is set to TRUE if all the above variables were set.
-#                     This will be set to false if ILU or ILUT are not found,
-#                     even if they are not needed. In most systems, if one
-#                     library is found all the others are as well. That's the
-#                     way the DevIL developers release it.
-
-# TODO: Add version support.
-# Tested under Linux and Windows (MSVC)
-
-#include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-include(FindPackageHandleStandardArgs)
-
-find_path(IL_INCLUDE_DIR il.h
-  PATH_SUFFIXES include IL
-  DOC "The path to the directory that contains il.h"
-)
-
-#message("IL_INCLUDE_DIR is ${IL_INCLUDE_DIR}")
-
-find_library(IL_LIBRARIES
-  NAMES IL DEVIL
-  PATH_SUFFIXES lib64 lib lib32
-  DOC "The file that corresponds to the base il library."
-)
-
-#message("IL_LIBRARIES is ${IL_LIBRARIES}")
-
-find_library(ILUT_LIBRARIES
-  NAMES ILUT
-  PATH_SUFFIXES lib64 lib lib32
-  DOC "The file that corresponds to the il (system?) utility library."
-)
-
-#message("ILUT_LIBRARIES is ${ILUT_LIBRARIES}")
-
-find_library(ILU_LIBRARIES
-  NAMES ILU
-  PATH_SUFFIXES lib64 lib lib32
-  DOC "The file that corresponds to the il utility library."
-)
-
-#message("ILU_LIBRARIES is ${ILU_LIBRARIES}")
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(IL DEFAULT_MSG
-                                  IL_LIBRARIES IL_INCLUDE_DIR)
--- a/code/AssetLib/3DS/3DSExporter.cpp
+++ b/code/AssetLib/3DS/3DSExporter.cpp
@@ -76,14 +76,14 @@ class ChunkWriter {

 public:
    ChunkWriter(StreamWriterLE &writer, uint16_t chunk_type) :
-            mWriter(writer) {
-        mChunkStartPos = writer.GetCurrentPos();
+            mWriter(writer),
+            mChunkStartPos(writer.GetCurrentPos()) {
        writer.PutU2(chunk_type);
-        writer.PutU4((uint32_t)CHUNK_SIZE_NOT_SET);
+        writer.PutU4(static_cast<uint32_t>(CHUNK_SIZE_NOT_SET));
    }

    ~ChunkWriter() {
-        std::size_t head_pos = mWriter.GetCurrentPos();
+        const std::size_t head_pos = mWriter.GetCurrentPos();

        ai_assert(head_pos > mChunkStartPos);
        const std::size_t chunk_size = head_pos - mChunkStartPos;
@@ -95,7 +95,7 @@ public:

 private:
    StreamWriterLE &mWriter;
-    std::size_t mChunkStartPos;
+    std::size_t mChunkStartPos{0};
 };

 // Return an unique name for a given |mesh| attached to |node| that
--- a/code/AssetLib/DXF/DXFHelper.h
+++ b/code/AssetLib/DXF/DXFHelper.h
@@ -100,7 +100,7 @@ public:
    }

    // -----------------------------------------
-    float ValueAsFloat() const {
+    ai_real ValueAsFloat() const {
        return fast_atof(value.c_str());
    }

--- a/code/AssetLib/FBX/FBXCommon.h
+++ b/code/AssetLib/FBX/FBXCommon.h
@@ -47,8 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #ifndef ASSIMP_BUILD_NO_FBX_EXPORTER

-namespace Assimp {
-namespace FBX {
+namespace Assimp::FBX {

 static constexpr size_t NumNullRecords = 25;

@@ -84,8 +83,7 @@ enum TransformInheritance {
    TransformInheritance_MAX // end-of-enum sentinel
 };

-} // namespace FBX
-} // namespace Assimp
+} // namespace Assimp::FBX

 #endif // ASSIMP_BUILD_NO_FBX_EXPORTER

--- a/code/AssetLib/FBX/FBXExporter.cpp
+++ b/code/AssetLib/FBX/FBXExporter.cpp
@@ -1582,6 +1582,7 @@ void FBXExporter::WriteObjects () {
        }
    }

+    std::map<std::string, std::string> tpath_by_image;
    // FbxVideo - stores images used by textures.
    for (const auto &it : uid_by_image) {
        FBX::Node n("Video");
@@ -1601,10 +1602,21 @@ void FBXExporter::WriteObjects () {
            std::stringstream newPath;
            if (embedded_texture->mFilename.length > 0) {
                newPath << embedded_texture->mFilename.C_Str();
+                // If newPath doesn't end in an extension, add extension from embedded_texture->achFormatHint
+                std::string np = newPath.str();
+                size_t dot_pos = np.find_last_of('.');
+                if (dot_pos == std::string::npos || dot_pos < np.find_last_of("/\\")) {
+                    // No extension found, add one
+                    newPath << "." << embedded_texture->achFormatHint;
+                }
            } else if (embedded_texture->achFormatHint[0]) {
                int texture_index = std::stoi(path.substr(1, path.size() - 1));
                newPath << texture_index << "." << embedded_texture->achFormatHint;
            }
+            auto elem = tpath_by_image.find(path);
+            if (elem == tpath_by_image.end()) {
+                tpath_by_image[path] = newPath.str();
+            }
            path = newPath.str();
            // embed the texture
            size_t texture_size = static_cast<size_t>(embedded_texture->mWidth * std::max(embedded_texture->mHeight, 1u));
@@ -1723,6 +1735,17 @@ void FBXExporter::WriteObjects () {
            unsigned int max = sizeof(aiUVTransform);
            aiGetMaterialFloatArray(mat, AI_MATKEY_UVTRANSFORM(aiTextureType_DIFFUSE, 0), (ai_real *)&trafo, &max);

+            auto tp_elem = tpath_by_image.find(texture_path);
+            std::string tfile_path = texture_path;
+            if (tp_elem != tpath_by_image.end()) {
+                tfile_path = tp_elem->second;
+            } else {
+                std::stringstream err;
+                err << "Texture path not found for texure " << texture_path;
+                err << " on material " << i;
+                ASSIMP_LOG_WARN(err.str());
+            }
+
            // now write the actual texture node
            FBX::Node tnode("Texture");
            // TODO: some way to determine texture name?
@@ -1743,8 +1766,8 @@ void FBXExporter::WriteObjects () {
            // can't easily determine which texture path will be correct,
            // so just store what we have in every field.
            // these being incorrect is a common problem with FBX anyway.
-            tnode.AddChild("FileName", texture_path);
-            tnode.AddChild("RelativeFilename", texture_path);
+            tnode.AddChild("FileName", tp_elem->second);
+            tnode.AddChild("RelativeFilename", tp_elem->second);
            tnode.AddChild("ModelUVTranslation", double(0.0), double(0.0));
            tnode.AddChild("ModelUVScaling", double(1.0), double(1.0));
            tnode.AddChild("Texture_Alpha_Source", "None");
--- a/code/AssetLib/FBX/FBXParser.h
+++ b/code/AssetLib/FBX/FBXParser.h
@@ -64,7 +64,7 @@ class Parser;
 class Element;

 using ScopeList = std::vector<Scope*>;
-using ElementMap = std::fbx_unordered_multimap< std::string, Element*>;
+using ElementMap = std::multimap< std::string, Element*>;
 using ElementCollection = std::pair<ElementMap::const_iterator,ElementMap::const_iterator>;

 #define new_Scope new (allocator.Allocate(sizeof(Scope))) Scope
--- a/code/AssetLib/FBX/FBXUtil.cpp
+++ b/code/AssetLib/FBX/FBXUtil.cpp
@@ -50,11 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 #include <cstring>

-#ifndef ASSIMP_BUILD_NO_FBX_IMPORTER
-
-namespace Assimp {
-namespace FBX {
-namespace Util {
+namespace Assimp::FBX::Util {

 // ------------------------------------------------------------------------------------------------
 const char* TokenTypeString(TokenType t)
@@ -233,8 +229,5 @@ std::string EncodeBase64(const char* data, size_t length)
    return encoded_string;
 }

-} // !Util
-} // !FBX
-} // !Assimp
+} // namespace Assimp::FBX::Util

-#endif
--- a/code/AssetLib/FBX/FBXUtil.h
+++ b/code/AssetLib/FBX/FBXUtil.h
@@ -49,10 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "FBXTokenizer.h"
 #include <stdint.h>

-namespace Assimp {
-namespace FBX {
-
-namespace Util {
+namespace Assimp::FBX::Util {

 /** helper for std::for_each to delete all heap-allocated items in a container */
 template<typename T>
@@ -73,12 +70,9 @@ struct destructor_fun {
    }
 };

-
 /** Get a string representation for a #TokenType. */
 const char* TokenTypeString(TokenType t);

-
-
 /** Format log/error messages using a given offset in the source binary file
 *
 *  @param offset offset within the file
@@ -129,8 +123,6 @@ char EncodeBase64(char byte);
 *  @return base64-encoded string*/
 std::string EncodeBase64(const char* data, size_t length);

-}
-}
 }

 #endif // ! INCLUDED_AI_FBX_UTIL_H
--- a/code/AssetLib/MD5/MD5Loader.cpp
+++ b/code/AssetLib/MD5/MD5Loader.cpp
@@ -361,19 +361,19 @@ void MD5Importer::LoadMD5MeshFile() {
 #else

    // FIX: MD5 files exported from Blender can have empty meshes
+    unsigned int numMaterials = 0;
    for (std::vector<MD5::MeshDesc>::const_iterator it = meshParser.mMeshes.begin(), end = meshParser.mMeshes.end(); it != end; ++it) {
        if (!(*it).mFaces.empty() && !(*it).mVertices.empty()) {
-            ++mScene->mNumMaterials;
+            ++numMaterials;
        }
    }

    // generate all meshes
-    mScene->mNumMeshes = mScene->mNumMaterials;
-    mScene->mMeshes = new aiMesh *[mScene->mNumMeshes];
-    mScene->mMaterials = new aiMaterial *[mScene->mNumMeshes];
+    mScene->mMeshes = new aiMesh *[numMaterials];
+    mScene->mMaterials = new aiMaterial *[numMaterials];

    //  storage for node mesh indices
-    pcNode->mNumMeshes = mScene->mNumMeshes;
+    pcNode->mNumMeshes = numMaterials;
    pcNode->mMeshes = new unsigned int[pcNode->mNumMeshes];
    for (unsigned int m = 0; m < pcNode->mNumMeshes; ++m) {
        pcNode->mMeshes[m] = m;
@@ -386,7 +386,10 @@ void MD5Importer::LoadMD5MeshFile() {
            continue;
        }

-        aiMesh *mesh = mScene->mMeshes[n] = new aiMesh();
+        aiMesh* mesh = new aiMesh();
+        mScene->mMeshes[n] = mesh;
+        ++mScene->mNumMeshes;
+
        mesh->mPrimitiveTypes = aiPrimitiveType_TRIANGLE;

        // generate unique vertices in our internal verbose format
@@ -508,6 +511,7 @@ void MD5Importer::LoadMD5MeshFile() {
        // generate a material for the mesh
        aiMaterial *mat = new aiMaterial();
        mScene->mMaterials[n] = mat;
+        ++mScene->mNumMaterials;

        // insert the typical doom3 textures:
        // nnn_local.tga  - normal map
--- a/code/AssetLib/MDC/MDCLoader.cpp
+++ b/code/AssetLib/MDC/MDCLoader.cpp
@@ -324,6 +324,15 @@ void MDCImporter::InternReadFile(

 #endif

+        // boundary check for pcVerts
+        auto surfStart = reinterpret_cast<const uint8_t*>(pcSurface);
+        const uint8_t* surfEnd = surfStart + pcSurface->ulOffsetEnd;
+        auto vertBufStart = reinterpret_cast<const uint8_t*>(pcVerts);
+        const size_t needVertBytes = sizeof(MDC::BaseVertex) * pcSurface->ulNumVertices;
+        if (vertBufStart < surfStart || vertBufStart + needVertBytes > surfEnd) {
+            throw DeadlyImportError("MDCImporter: pcVerts points outside of surface block.");
+        }
+
        const MDC::CompressedVertex *pcCVerts = nullptr;
        int16_t *mdcCompVert = nullptr;

@@ -335,6 +344,12 @@ void MDCImporter::InternReadFile(
                pcCVerts = (const MDC::CompressedVertex *)((int8_t *)pcSurface +
                                                           pcSurface->ulOffsetCompVerts) +
                           *mdcCompVert * pcSurface->ulNumVertices;
+                auto cvertBufStart = reinterpret_cast<const uint8_t*>(pcCVerts);
+                const size_t needCompVertBytes = sizeof(MDC::CompressedVertex) * pcSurface->ulNumVertices;
+                if (cvertBufStart < surfStart || cvertBufStart > surfEnd ||
+                    needCompVertBytes > static_cast<size_t>(surfEnd - cvertBufStart)) {
+                    throw DeadlyImportError("MDCImporter: pcCVerts points outside of surface block.");
+                }
            } else
                mdcCompVert = nullptr;
        }
--- a/code/AssetLib/MDL/MDLLoader.cpp
+++ b/code/AssetLib/MDL/MDLLoader.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2025, assimp team
+Copyright (c) 2006-2026, assimp team

 All rights reserved.

@@ -602,6 +602,9 @@ void MDLImporter::SetupMaterialProperties_3DGS_MDL5_Quake1() {
 // Read a MDL 3,4,5 file
 void MDLImporter::InternReadFile_3DGS_MDL345() {
    ai_assert(nullptr != pScene);
+    if (pScene == nullptr) {
+        throw DeadlyImportError("INvalid scene pointer detected.");
+    }

    // the header of MDL 3/4/5 is nearly identical to the original Quake1 header
    BE_NCONST MDL::Header *pcHeader = (BE_NCONST MDL::Header *)this->mBuffer;
@@ -610,6 +613,10 @@ void MDLImporter::InternReadFile_3DGS_MDL345() {
 #endif
    ValidateHeader_Quake1(pcHeader);

+    if (pcHeader->synctype < 0) {
+        throw DeadlyImportError("Invalid synctype value in MDL header; possible corrupt file.");
+    }
+
    // current cursor position in the file
    const unsigned char *szCurrent = (const unsigned char *)(pcHeader + 1);
    const unsigned char *szEnd = mBuffer + iFileSize;
@@ -619,8 +626,7 @@ void MDLImporter::InternReadFile_3DGS_MDL345() {
        if (szCurrent + sizeof(uint32_t) > szEnd) {
            throw DeadlyImportError("Texture data past end of file.");
        }
-        BE_NCONST MDL::Skin *pcSkin;
-        pcSkin = (BE_NCONST MDL::Skin *)szCurrent;
+        BE_NCONST MDL::Skin *pcSkin = (BE_NCONST MDL::Skin *)szCurrent;
        AI_SWAP4(pcSkin->group);
        // create one output image
        unsigned int iSkip = i ? UINT_MAX : 0;
@@ -1838,6 +1844,10 @@ void MDLImporter::GenerateOutputMeshes_3DGS_MDL7(
    const unsigned int iNumOutBones = pcHeader->bones_num;

    for (std::vector<aiMaterial *>::size_type i = 0; i < shared.pcMats.size(); ++i) {
+        if (splitGroupData.aiSplit == nullptr) {
+            continue;
+        }
+
        if (!splitGroupData.aiSplit[i]->empty()) {

            // allocate the output mesh
--- a/code/AssetLib/Obj/ObjFileParser.cpp
+++ b/code/AssetLib/Obj/ObjFileParser.cpp
@@ -80,7 +80,7 @@ ObjFileParser::ObjFileParser(IOStreamBuffer<char> &streamBuffer, const std::stri
        m_buffer(),
        m_pIO(io),
        m_progress(progress),
-        m_originalObjFileName(originalObjFileName) {
+        m_originalObjFileName(originalObjFileName) { 
    std::fill_n(m_buffer, Buffersize, '\0');

    // Create the model instance to store all the data
--- a/code/AssetLib/Q3D/Q3DLoader.cpp
+++ b/code/AssetLib/Q3D/Q3DLoader.cpp
@@ -379,7 +379,12 @@ void Q3DImporter::InternReadFile(const std::string &pFile,
            light->mColorSpecular = light->mColorDiffuse;

            // We don't need the rest, but we need to know where this chunk ends.
-            unsigned int temp = (unsigned int)(stream.GetI4() * stream.GetI4());
+            const auto t1 = stream.GetI4();
+            const auto t2 = stream.GetI4();
+            if (t1 < 0 || t2 < 0) {
+                throw DeadlyImportError("Quick3D: Overflow detected.");
+            }
+            const unsigned int temp = static_cast<unsigned int>(t1*t2);

            // skip the background file name
            while (stream.GetI1())
--- a/code/AssetLib/Step/STEPFile.h
+++ b/code/AssetLib/Step/STEPFile.h
@@ -919,6 +919,10 @@ private:
 #pragma warning(pop)
 #endif // _MSC_VER

+#if _MSC_VER > 1920
+#pragma warning(pop)
+#endif
+
 } // namespace STEP
 } // namespace Assimp

--- a/code/AssetLib/USD/USDLoader.cpp
+++ b/code/AssetLib/USD/USDLoader.cpp
@@ -77,7 +77,6 @@ static constexpr aiImporterDesc desc = {
 };

 namespace Assimp {
-using namespace std;

 // Constructor to be privately used by Importer
 USDImporter::USDImporter() :
--- a/code/AssetLib/USD/USDLoader.h
+++ b/code/AssetLib/USD/USDLoader.h
@@ -53,9 +53,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "USDLoaderImplTinyusdz.h"

 namespace Assimp {
-class USDImporter : public BaseImporter {
+
+/// @brief USD Importer class
+class USDImporter final : public BaseImporter {
 public:
+    /// @brief  Constructor
    USDImporter();
+
+    /// @brief  Destructor
    ~USDImporter() override = default;

    /// \brief  Returns whether the class can handle the format of the given file.
--- a/code/AssetLib/USD/USDLoaderImplTinyusdz.cpp
+++ b/code/AssetLib/USD/USDLoaderImplTinyusdz.cpp
@@ -44,31 +44,33 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

 #ifndef ASSIMP_BUILD_NO_USD_IMPORTER
+
+#include "USDLoaderImplTinyusdz.h"
+#include "USDLoaderImplTinyusdzHelper.h"
+#include "USDLoaderUtil.h"
+#include "USDPreprocessor.h"
+#include "io-util.hh" // namespace tinyusdz::io
+#include "tydra/scene-access.hh"
+#include "tydra/shader-network.hh"
+
 #include <memory>
 #include <sstream>

 // internal headers
-#include <assimp/ai_assert.h>
-#include <assimp/anim.h>
+#include "assimp/MemoryIOWrapper.h"
 #include <assimp/CreateAnimMesh.h>
 #include <assimp/DefaultIOSystem.h>
-#include <assimp/DefaultLogger.hpp>
-#include <assimp/fast_atof.h>
-#include <assimp/Importer.hpp>
-#include <assimp/importerdesc.h>
 #include <assimp/IOStreamBuffer.h>
-#include <assimp/IOSystem.hpp>
-#include "assimp/MemoryIOWrapper.h"
-#include <assimp/StringUtils.h>
 #include <assimp/StreamReader.h>
+#include <assimp/StringUtils.h>
+#include <assimp/ai_assert.h>
+#include <assimp/anim.h>
+#include <assimp/fast_atof.h>
+#include <assimp/importerdesc.h>
+#include <assimp/DefaultLogger.hpp>
+#include <assimp/IOSystem.hpp>
+#include <assimp/Importer.hpp>

-#include "io-util.hh" // namespace tinyusdz::io
-#include "tydra/scene-access.hh"
-#include "tydra/shader-network.hh"
-#include "USDLoaderImplTinyusdzHelper.h"
-#include "USDLoaderImplTinyusdz.h"
-#include "USDLoaderUtil.h"
-#include "USDPreprocessor.h"

 #include "../../../contrib/tinyusdz/assimp_tinyusdz_logging.inc"

@@ -77,17 +79,18 @@ namespace {
 }

 namespace Assimp {
-using namespace std;

-void USDImporterImplTinyusdz::InternReadFile(
-        const std::string &pFile,
-        aiScene *pScene,
-        IOSystem *pIOHandler) {
+using Assimp::tinyUsdzMat4ToAiMat4;
+using Assimp::tinyusdzNodeTypeFor;
+using tinyusdz::tydra::NodeType;
+using namespace tinyusdz::tydra;
+
+void USDImporterImplTinyusdz::InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler) {
    // Grab filename for logging purposes
    size_t pos = pFile.find_last_of('/');
-    string basePath = pFile.substr(0, pos);
-    string nameWExt = pFile.substr(pos + 1);
-    stringstream ss;
+    std::string basePath = pFile.substr(0, pos);
+    std::string nameWExt = pFile.substr(pos + 1);
+    std::stringstream ss;
    ss.str("");
    ss << "InternReadFile(): model" << nameWExt;
    TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
@@ -160,9 +163,10 @@ void USDImporterImplTinyusdz::InternReadFile(
        TINYUSDZLOGE(TAG, "%s", ss.str().c_str());
        return;
    }
-    tinyusdz::tydra::RenderScene render_scene;
-    tinyusdz::tydra::RenderSceneConverter converter;
-    tinyusdz::tydra::RenderSceneConverterEnv env(stage);
+    
+    RenderScene render_scene;
+    RenderSceneConverter converter;
+    RenderSceneConverterEnv env(stage);
    std::string usd_basedir = tinyusdz::io::GetBaseDir(pFile);
    env.set_search_paths({ usd_basedir }); // {} needed to convert to vector of char

@@ -223,9 +227,8 @@ void USDImporterImplTinyusdz::InternReadFile(

    setupBlendShapes(render_scene, pScene, nameWExt);
 }
-void USDImporterImplTinyusdz::animations(
-    const tinyusdz::tydra::RenderScene& render_scene,
-    aiScene* pScene) {
+
+void USDImporterImplTinyusdz::animations(const tinyusdz::tydra::RenderScene &render_scene, aiScene *pScene) {
    if (render_scene.animations.empty()) {
        return;
    }
@@ -265,7 +268,7 @@ void USDImporterImplTinyusdz::animations(

            for (const auto &[channelType, animChannel] : animationChannelMap) {
                switch (channelType) {
-                case tinyusdz::tydra::AnimationChannel::ChannelType::Rotation:
+                case AnimationChannel::ChannelType::Rotation:
                    if (animChannel.rotations.static_value.has_value()) {
                        rotationKeys.emplace_back(0, tinyUsdzQuatToAiQuat(animChannel.rotations.static_value.value()));
                    }
@@ -277,7 +280,7 @@ void USDImporterImplTinyusdz::animations(
                        rotationKeys.emplace_back(rotationAnimSampler.t, tinyUsdzQuatToAiQuat(rotationAnimSampler.value));
                    }
                    break;
-                case tinyusdz::tydra::AnimationChannel::ChannelType::Scale:
+                case AnimationChannel::ChannelType::Scale:
                    if (animChannel.scales.static_value.has_value()) {
                        scalingKeys.emplace_back(0, tinyUsdzScaleOrPosToAssimp(animChannel.scales.static_value.value()));
                    }
@@ -288,7 +291,7 @@ void USDImporterImplTinyusdz::animations(
                        scalingKeys.emplace_back(scaleAnimSampler.t, tinyUsdzScaleOrPosToAssimp(scaleAnimSampler.value));
                    }
                    break;
-                case tinyusdz::tydra::AnimationChannel::ChannelType::Transform:
+                case AnimationChannel::ChannelType::Transform:
                    if (animChannel.transforms.static_value.has_value()) {
                        aiVector3D position;
                        aiVector3D scale;
@@ -314,7 +317,7 @@ void USDImporterImplTinyusdz::animations(
                        rotationKeys.emplace_back(transformAnimSampler.t, rotation);
                    }
                    break;
-                case tinyusdz::tydra::AnimationChannel::ChannelType::Translation:
+                case AnimationChannel::ChannelType::Translation:
                    if (animChannel.translations.static_value.has_value()) {
                        positionKeys.emplace_back(0, tinyUsdzScaleOrPosToAssimp(animChannel.translations.static_value.value()));
                    }
@@ -352,7 +355,7 @@ void USDImporterImplTinyusdz::meshes(
        const tinyusdz::tydra::RenderScene &render_scene,
        aiScene *pScene,
        const std::string &nameWExt) {
-    stringstream ss;
+    std::stringstream ss;
    pScene->mNumMeshes = static_cast<unsigned int>(render_scene.meshes.size());
    pScene->mMeshes = new aiMesh *[pScene->mNumMeshes]();
    ss.str("");
@@ -364,10 +367,7 @@ void USDImporterImplTinyusdz::meshes(
        pScene->mMeshes[meshIdx] = new aiMesh();
        pScene->mMeshes[meshIdx]->mName.Set(render_scene.meshes[meshIdx].prim_name);
        ss.str("");
-        ss << "   mesh[" << meshIdx << "]: " <<
-                render_scene.meshes[meshIdx].joint_and_weights.jointIndices.size() << " jointIndices, " <<
-                render_scene.meshes[meshIdx].joint_and_weights.jointWeights.size() << " jointWeights, elementSize: " <<
-                render_scene.meshes[meshIdx].joint_and_weights.elementSize;
+        ss << "   mesh[" << meshIdx << "]: " << render_scene.meshes[meshIdx].joint_and_weights.jointIndices.size() << " jointIndices, " << render_scene.meshes[meshIdx].joint_and_weights.jointWeights.size() << " jointWeights, elementSize: " << render_scene.meshes[meshIdx].joint_and_weights.elementSize;
        TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
        ss.str("");
        ss << "        skel_id: " << render_scene.meshes[meshIdx].skel_id;
@@ -386,12 +386,8 @@ void USDImporterImplTinyusdz::meshes(
    }
 }

-void USDImporterImplTinyusdz::verticesForMesh(
-        const tinyusdz::tydra::RenderScene &render_scene,
-        aiScene *pScene,
-        size_t meshIdx,
-        const std::string &nameWExt) {
-    UNUSED(nameWExt);
+void USDImporterImplTinyusdz::verticesForMesh(const tinyusdz::tydra::RenderScene &render_scene, 
+        aiScene *pScene, size_t meshIdx, const std::string &) {
    const auto numVertices = static_cast<unsigned int>(render_scene.meshes[meshIdx].points.size());
    pScene->mMeshes[meshIdx]->mNumVertices = numVertices;
    pScene->mMeshes[meshIdx]->mVertices = new aiVector3D[pScene->mMeshes[meshIdx]->mNumVertices];
@@ -450,7 +446,7 @@ void USDImporterImplTinyusdz::verticesForMesh(

            std::swap_ranges(aiBonesVertexWeights[boneIndex].begin(), aiBonesVertexWeights[boneIndex].end(), pScene->mMeshes[meshIdx]->mBones[boneIndex]->mWeights);
        }
-    }  // Skinned mesh end
+    } // Skinned mesh end

    for (size_t j = 0; j < pScene->mMeshes[meshIdx]->mNumVertices; ++j) {
        pScene->mMeshes[meshIdx]->mVertices[j].x = render_scene.meshes[meshIdx].points[j][0];
@@ -459,12 +455,8 @@ void USDImporterImplTinyusdz::verticesForMesh(
    }
 }

-void USDImporterImplTinyusdz::facesForMesh(
-        const tinyusdz::tydra::RenderScene &render_scene,
-        aiScene *pScene,
-        size_t meshIdx,
-        const std::string &nameWExt) {
-    UNUSED(nameWExt);
+void USDImporterImplTinyusdz::facesForMesh(const RenderScene &render_scene, aiScene *pScene, 
+        size_t meshIdx, const std::string &) {
    pScene->mMeshes[meshIdx]->mNumFaces = static_cast<unsigned int>(render_scene.meshes[meshIdx].faceVertexCounts().size());
    pScene->mMeshes[meshIdx]->mFaces = new aiFace[pScene->mMeshes[meshIdx]->mNumFaces]();
    size_t faceVertIdxOffset = 0;
@@ -479,12 +471,8 @@ void USDImporterImplTinyusdz::facesForMesh(
    }
 }

-void USDImporterImplTinyusdz::normalsForMesh(
-        const tinyusdz::tydra::RenderScene &render_scene,
-        aiScene *pScene,
-        size_t meshIdx,
-        const std::string &nameWExt) {
-    UNUSED(nameWExt);
+void USDImporterImplTinyusdz::normalsForMesh(const RenderScene &render_scene, aiScene *pScene,
+        size_t meshIdx, const std::string &) {
    pScene->mMeshes[meshIdx]->mNormals = new aiVector3D[pScene->mMeshes[meshIdx]->mNumVertices];
    const float *floatPtr = reinterpret_cast<const float *>(render_scene.meshes[meshIdx].normals.get_data().data());
    for (size_t vertIdx = 0, fpj = 0; vertIdx < pScene->mMeshes[meshIdx]->mNumVertices; ++vertIdx, fpj += 3) {
@@ -494,20 +482,16 @@ void USDImporterImplTinyusdz::normalsForMesh(
    }
 }

-void USDImporterImplTinyusdz::materialsForMesh(
-        const tinyusdz::tydra::RenderScene &render_scene,
-        aiScene *pScene,
-        size_t meshIdx,
-        const std::string &nameWExt) {
-    UNUSED(render_scene); UNUSED(pScene); UNUSED(meshIdx); UNUSED(nameWExt);
+void USDImporterImplTinyusdz::materialsForMesh(const RenderScene&, aiScene*,
+        size_t, const std::string&) {
+    // todo
 }

 void USDImporterImplTinyusdz::uvsForMesh(
        const tinyusdz::tydra::RenderScene &render_scene,
        aiScene *pScene,
        size_t meshIdx,
-        const std::string &nameWExt) {
-    UNUSED(nameWExt);
+        const std::string&) {
    const size_t uvSlotsCount = render_scene.meshes[meshIdx].texcoords.size();
    if (uvSlotsCount < 1) {
        return;
@@ -535,10 +519,8 @@ static aiColor3D *ownedColorPtrFor(const std::array<float, 3> &color) {
    return colorPtr;
 }

-static std::string nameForTextureWithId(
-        const tinyusdz::tydra::RenderScene &render_scene,
-        const int targetId) {
-    stringstream ss;
+static std::string nameForTextureWithId(const RenderScene &render_scene, const int targetId) {
+    std::stringstream ss;
    std::string texName;
    for (const auto &image : render_scene.images) {
        if (image.buffer_id == targetId) {
@@ -556,16 +538,15 @@ static std::string nameForTextureWithId(
 }

 static void assignTexture(
-        const tinyusdz::tydra::RenderScene &render_scene,
-        const tinyusdz::tydra::RenderMaterial &material,
+        const RenderScene &render_scene,
+        const RenderMaterial &,
        aiMaterial *mat,
        const int textureId,
        const int aiTextureType) {
-    UNUSED(material);
    std::string name = nameForTextureWithId(render_scene, textureId);
    aiString *texName = new aiString();
    texName->Set(name);
-    stringstream ss;
+    std::stringstream ss;
    ss.str("");
    ss << "assignTexture(): name: " << name;
    TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
@@ -577,9 +558,8 @@ void USDImporterImplTinyusdz::materials(
        const tinyusdz::tydra::RenderScene &render_scene,
        aiScene *pScene,
        const std::string &nameWExt) {
-    const size_t numMaterials{render_scene.materials.size()};
-    (void) numMaterials; // Ignore unused variable when -Werror enabled
-    stringstream ss;
+    const size_t numMaterials{ render_scene.materials.size() };
+    std::stringstream ss;
    ss.str("");
    ss << "materials(): model" << nameWExt << ", numMaterials: " << numMaterials;
    TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
@@ -587,6 +567,7 @@ void USDImporterImplTinyusdz::materials(
    if (render_scene.materials.empty()) {
        return;
    }
+
    pScene->mMaterials = new aiMaterial *[render_scene.materials.size()];
    for (const auto &material : render_scene.materials) {
        ss.str("");
@@ -669,22 +650,18 @@ void USDImporterImplTinyusdz::materials(

 void USDImporterImplTinyusdz::textures(
        const tinyusdz::tydra::RenderScene &render_scene,
-        aiScene *pScene,
+        aiScene*,
        const std::string &nameWExt) {
-    UNUSED(pScene);
-    const size_t numTextures{render_scene.textures.size()};
-    UNUSED(numTextures); // Ignore unused variable when -Werror enabled
-    stringstream ss;
+    const size_t numTextures{ render_scene.textures.size() };
+    std::stringstream ss;
    ss.str("");
    ss << "textures(): model" << nameWExt << ", numTextures: " << numTextures;
    TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
-    size_t i{0};
-    UNUSED(i);
+    size_t i{ 0 };
+    
    for (const auto &texture : render_scene.textures) {
-        UNUSED(texture);
        ss.str("");
-        ss << "    texture[" << i << "]: id: " << texture.texture_image_id << ", disp name: |" << texture.display_name << "|, varname_uv: " <<
-                texture.varname_uv << ", prim_name: |" << texture.prim_name << "|, abs_path: |" << texture.abs_path << "|";
+        ss << "    texture[" << i << "]: id: " << texture.texture_image_id << ", disp name: |" << texture.display_name << "|, varname_uv: " << texture.varname_uv << ", prim_name: |" << texture.prim_name << "|, abs_path: |" << texture.abs_path << "|";
        TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
        ++i;
    }
@@ -698,15 +675,12 @@ void USDImporterImplTinyusdz::textures(
 * @param nameWExt      filename w/ext (use to extract file type hint)
 * @return              aiTexture ptr
 */
-static aiTexture *ownedEmbeddedTextureFor(
-        const tinyusdz::tydra::RenderScene &render_scene,
-        const tinyusdz::tydra::TextureImage &image,
-        const std::string &nameWExt) {
-    UNUSED(nameWExt);
-    stringstream ss;
+static aiTexture *ownedEmbeddedTextureFor(const RenderScene &render_scene, const TextureImage &image,
+        const std::string&) {
+    std::stringstream ss;
    aiTexture *tex = new aiTexture();
    size_t pos = image.asset_identifier.find_last_of('/');
-    string embTexName{image.asset_identifier.substr(pos + 1)};
+    std::string embTexName{ image.asset_identifier.substr(pos + 1) };
    tex->mFilename.Set(image.asset_identifier.c_str());
    tex->mHeight = image.height;

@@ -714,20 +688,20 @@ static aiTexture *ownedEmbeddedTextureFor(
    if (tex->mHeight == 0) {
        pos = embTexName.find_last_of('.');
        strncpy(tex->achFormatHint, embTexName.substr(pos + 1).c_str(), 3);
-        const size_t imageBytesCount{render_scene.buffers[image.buffer_id].data.size()};
-        tex->pcData = (aiTexel *) new char[imageBytesCount];
+        const size_t imageBytesCount{ render_scene.buffers[image.buffer_id].data.size() };
+        tex->pcData = (aiTexel *)new char[imageBytesCount];
        memcpy(tex->pcData, &render_scene.buffers[image.buffer_id].data[0], imageBytesCount);
    } else {
-        string formatHint{"rgba8888"};
+        std::string formatHint{ "rgba8888" };
        strncpy(tex->achFormatHint, formatHint.c_str(), 8);
-        const size_t imageTexelsCount{tex->mWidth * tex->mHeight};
-        tex->pcData = (aiTexel *) new char[imageTexelsCount * image.channels];
+        const size_t imageTexelsCount{ tex->mWidth * tex->mHeight };
+        tex->pcData = (aiTexel *)new char[imageTexelsCount * image.channels];
        const float *floatPtr = reinterpret_cast<const float *>(&render_scene.buffers[image.buffer_id].data[0]);
        ss.str("");
        ss << "ownedEmbeddedTextureFor(): manual fill...";
        TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
        for (size_t i = 0, fpi = 0; i < imageTexelsCount; ++i, fpi += 4) {
-            tex->pcData[i].b = static_cast<uint8_t>(floatPtr[fpi]     * 255);
+            tex->pcData[i].b = static_cast<uint8_t>(floatPtr[fpi] * 255);
            tex->pcData[i].g = static_cast<uint8_t>(floatPtr[fpi + 1] * 255);
            tex->pcData[i].r = static_cast<uint8_t>(floatPtr[fpi + 2] * 255);
            tex->pcData[i].a = static_cast<uint8_t>(floatPtr[fpi + 3] * 255);
@@ -739,13 +713,9 @@ static aiTexture *ownedEmbeddedTextureFor(
    return tex;
 }

-void USDImporterImplTinyusdz::textureImages(
-        const tinyusdz::tydra::RenderScene &render_scene,
-        aiScene *pScene,
-        const std::string &nameWExt) {
-    stringstream ss;
-    const size_t numTextureImages{render_scene.images.size()};
-    UNUSED(numTextureImages); // Ignore unused variable when -Werror enabled
+void USDImporterImplTinyusdz::textureImages(const RenderScene &render_scene, aiScene *pScene, const std::string &nameWExt) {
+    std::stringstream ss;
+    const size_t numTextureImages{ render_scene.images.size() };
    ss.str("");
    ss << "textureImages(): model" << nameWExt << ", numTextureImages: " << numTextureImages;
    TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
@@ -753,13 +723,15 @@ void USDImporterImplTinyusdz::textureImages(
    pScene->mNumTextures = 0;
    for (const auto &image : render_scene.images) {
        ss.str("");
-        ss << "    image[" << pScene->mNumTextures << "]: |" << image.asset_identifier << "| w: " << image.width << ", h: " << image.height <<
-           ", channels: " << image.channels << ", miplevel: " << image.miplevel << ", buffer id: " << image.buffer_id << "\n" <<
-           "    buffers.size(): " << render_scene.buffers.size() << ", data empty? " << render_scene.buffers[image.buffer_id].data.empty();
+        ss << "    image[" << pScene->mNumTextures << "]: |" << image.asset_identifier << "| w: " 
+            << image.width << ", h: " << image.height << ", channels: " << image.channels << ", miplevel: " 
+            << image.miplevel << ", buffer id: " << image.buffer_id << "\n"
+            << "    buffers.size(): " << render_scene.buffers.size() << ", data empty? " 
+            << render_scene.buffers[image.buffer_id].data.empty();
        TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
        if (image.buffer_id > -1 &&
-            image.buffer_id < static_cast<long int>(render_scene.buffers.size()) &&
-            !render_scene.buffers[image.buffer_id].data.empty()) {
+                image.buffer_id < static_cast<long int>(render_scene.buffers.size()) &&
+                !render_scene.buffers[image.buffer_id].data.empty()) {
            aiTexture *tex = ownedEmbeddedTextureFor(
                    render_scene,
                    image,
@@ -771,8 +743,8 @@ void USDImporterImplTinyusdz::textureImages(
                pScene->mTextures = new aiTexture *[render_scene.images.size()];
            }
            ss.str("");
-            ss << "    pScene->mTextures[" << pScene->mNumTextures << "] name: |" << tex->mFilename.C_Str() <<
-                    "|, w: " << tex->mWidth << ", h: " << tex->mHeight << ", hint: " << tex->achFormatHint;
+            ss << "    pScene->mTextures[" << pScene->mNumTextures << "] name: |" << tex->mFilename.C_Str() 
+                << "|, w: " << tex->mWidth << ", h: " << tex->mHeight << ", hint: " << tex->achFormatHint;
            TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
            pScene->mTextures[pScene->mNumTextures++] = tex;
        }
@@ -780,12 +752,9 @@ void USDImporterImplTinyusdz::textureImages(
 }

 void USDImporterImplTinyusdz::buffers(
-        const tinyusdz::tydra::RenderScene &render_scene,
-        aiScene *pScene,
-        const std::string &nameWExt) {
-    const size_t numBuffers{render_scene.buffers.size()};
-    UNUSED(pScene); UNUSED(numBuffers); // Ignore unused variable when -Werror enabled
-    stringstream ss;
+        const RenderScene &render_scene, aiScene*, const std::string &nameWExt) {
+    const size_t numBuffers{ render_scene.buffers.size() };
+    std::stringstream ss;
    ss.str("");
    ss << "buffers(): model" << nameWExt << ", numBuffers: " << numBuffers;
    TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
@@ -798,14 +767,9 @@ void USDImporterImplTinyusdz::buffers(
    }
 }

-using Assimp::tinyusdzNodeTypeFor;
-using Assimp::tinyUsdzMat4ToAiMat4;
-using tinyusdz::tydra::NodeType;
-aiNode *USDImporterImplTinyusdz::nodesRecursive(
-        aiNode *pNodeParent,
-        const tinyusdz::tydra::Node &node,
-        const std::vector<tinyusdz::tydra::SkelHierarchy> &skeletons) {
-    stringstream ss;
+aiNode *USDImporterImplTinyusdz::nodesRecursive(aiNode *pNodeParent, const tinyusdz::tydra::Node &node,
+        const std::vector<SkelHierarchy> &skeletons) {
+    std::stringstream ss;
    aiNode *cNode = new aiNode();
    cNode->mParent = pNodeParent;
    cNode->mName.Set(node.prim_name);
@@ -818,9 +782,9 @@ aiNode *USDImporterImplTinyusdz::nodesRecursive(
    }

    ss.str("");
-    ss << "nodesRecursive(): node " << cNode->mName.C_Str() <<
-            " type: |" << tinyusdzNodeTypeFor(node.nodeType) <<
-            "|, disp " << node.display_name << ", abs " << node.abs_path;
+    ss << "nodesRecursive(): node " << cNode->mName.C_Str() << " type: |" 
+        << tinyusdzNodeTypeFor(node.nodeType) 
+        << "|, disp " << node.display_name << ", abs " << node.abs_path;
    if (cNode->mParent != nullptr) {
        ss << " (parent " << cNode->mParent->mName.C_Str() << ")";
    }
@@ -861,15 +825,15 @@ aiNode *USDImporterImplTinyusdz::nodesRecursive(

    if (skelNode != nullptr) {
        // Convert USD skeleton into an Assimp node and make it the last child
-        cNode->mChildren[cNode->mNumChildren-1] = skeletonNodesRecursive(cNode, *skelNode);
+        cNode->mChildren[cNode->mNumChildren - 1] = skeletonNodesRecursive(cNode, *skelNode);
    }

    return cNode;
 }

 aiNode *USDImporterImplTinyusdz::skeletonNodesRecursive(
-        aiNode* pNodeParent,
-        const tinyusdz::tydra::SkelNode& joint) {
+        aiNode *pNodeParent,
+        const SkelNode &joint) {
    auto *cNode = new aiNode(joint.joint_path);
    cNode->mParent = pNodeParent;
    cNode->mNumMeshes = 0; // not a mesh node
@@ -884,7 +848,7 @@ aiNode *USDImporterImplTinyusdz::skeletonNodesRecursive(
    cNode->mChildren = new aiNode *[cNode->mNumChildren];

    for (unsigned i = 0; i < cNode->mNumChildren; ++i) {
-        const tinyusdz::tydra::SkelNode &childJoint = joint.children[i];
+        const SkelNode &childJoint = joint.children[i];
        cNode->mChildren[i] = skeletonNodesRecursive(cNode, childJoint);
    }

@@ -893,7 +857,7 @@ aiNode *USDImporterImplTinyusdz::skeletonNodesRecursive(

 void USDImporterImplTinyusdz::sanityCheckNodesRecursive(
        aiNode *cNode) {
-    stringstream ss;
+    std::stringstream ss;
    ss.str("");
    ss << "sanityCheckNodesRecursive(): node " << cNode->mName.C_Str();
    if (cNode->mParent != nullptr) {
@@ -906,16 +870,14 @@ void USDImporterImplTinyusdz::sanityCheckNodesRecursive(
    }
 }

-void USDImporterImplTinyusdz::setupBlendShapes(
-        const tinyusdz::tydra::RenderScene &render_scene,
-        aiScene *pScene,
+void USDImporterImplTinyusdz::setupBlendShapes(const RenderScene &render_scene, aiScene *pScene, 
        const std::string &nameWExt) {
-    stringstream ss;
+    std::stringstream ss;
    ss.str("");
    ss << "setupBlendShapes(): iterating over " << pScene->mNumMeshes << " meshes for model" << nameWExt;
    TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
    for (size_t meshIdx = 0; meshIdx < pScene->mNumMeshes; meshIdx++) {
-         blendShapesForMesh(render_scene, pScene, meshIdx, nameWExt);
+        blendShapesForMesh(render_scene, pScene, meshIdx, nameWExt);
    }
 }

@@ -923,10 +885,9 @@ void USDImporterImplTinyusdz::blendShapesForMesh(
        const tinyusdz::tydra::RenderScene &render_scene,
        aiScene *pScene,
        size_t meshIdx,
-        const std::string &nameWExt) {
-    UNUSED(nameWExt);
-    stringstream ss;
-    const unsigned int numBlendShapeTargets{static_cast<unsigned int>(render_scene.meshes[meshIdx].targets.size())};
+        const std::string &) {
+    std::stringstream ss;
+    const unsigned int numBlendShapeTargets{ static_cast<unsigned int>(render_scene.meshes[meshIdx].targets.size()) };
    UNUSED(numBlendShapeTargets); // Ignore unused variable when -Werror enabled
    ss.str("");
    ss << "    blendShapesForMesh(): mesh[" << meshIdx << "], numBlendShapeTargets: " << numBlendShapeTargets;
@@ -936,15 +897,13 @@ void USDImporterImplTinyusdz::blendShapesForMesh(
        pScene->mMeshes[meshIdx]->mAnimMeshes = new aiAnimMesh *[pScene->mMeshes[meshIdx]->mNumAnimMeshes];
    }
    auto mapIter = render_scene.meshes[meshIdx].targets.begin();
-    size_t animMeshIdx{0};
+    size_t animMeshIdx{ 0 };
    for (; mapIter != render_scene.meshes[meshIdx].targets.end(); ++mapIter) {
-        const std::string name{mapIter->first};
-        const tinyusdz::tydra::ShapeTarget shapeTarget{mapIter->second};
+        const std::string name{ mapIter->first };
+        const tinyusdz::tydra::ShapeTarget shapeTarget{ mapIter->second };
        pScene->mMeshes[meshIdx]->mAnimMeshes[animMeshIdx] = aiCreateAnimMesh(pScene->mMeshes[meshIdx]);
        ss.str("");
-        ss << "        mAnimMeshes[" << animMeshIdx << "]: mNumVertices: " << pScene->mMeshes[meshIdx]->mAnimMeshes[animMeshIdx]->mNumVertices <<
-                ", target: " << shapeTarget.pointIndices.size() << " pointIndices, " << shapeTarget.pointOffsets.size() <<
-                " pointOffsets, " << shapeTarget.normalOffsets.size() << " normalOffsets";
+        ss << "        mAnimMeshes[" << animMeshIdx << "]: mNumVertices: " << pScene->mMeshes[meshIdx]->mAnimMeshes[animMeshIdx]->mNumVertices << ", target: " << shapeTarget.pointIndices.size() << " pointIndices, " << shapeTarget.pointOffsets.size() << " pointOffsets, " << shapeTarget.normalOffsets.size() << " normalOffsets";
        TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
        for (size_t iVert = 0; iVert < shapeTarget.pointOffsets.size(); ++iVert) {
            pScene->mMeshes[meshIdx]->mAnimMeshes[animMeshIdx]->mVertices[shapeTarget.pointIndices[iVert]] +=
@@ -955,12 +914,7 @@ void USDImporterImplTinyusdz::blendShapesForMesh(
                    tinyUsdzScaleOrPosToAssimp(shapeTarget.normalOffsets[iVert]);
        }
        ss.str("");
-        ss << "        target[" << animMeshIdx << "]: name: " << name << ", prim_name: " <<
-                shapeTarget.prim_name << ", abs_path: " << shapeTarget.abs_path <<
-                ", display_name: " << shapeTarget.display_name << ", " << shapeTarget.pointIndices.size() <<
-                " pointIndices, " << shapeTarget.pointOffsets.size() << " pointOffsets, " <<
-                shapeTarget.normalOffsets.size() << " normalOffsets, " << shapeTarget.inbetweens.size() <<
-                " inbetweens";
+        ss << "        target[" << animMeshIdx << "]: name: " << name << ", prim_name: " << shapeTarget.prim_name << ", abs_path: " << shapeTarget.abs_path << ", display_name: " << shapeTarget.display_name << ", " << shapeTarget.pointIndices.size() << " pointIndices, " << shapeTarget.pointOffsets.size() << " pointOffsets, " << shapeTarget.normalOffsets.size() << " normalOffsets, " << shapeTarget.inbetweens.size() << " inbetweens";
        TINYUSDZLOGD(TAG, "%s", ss.str().c_str());
        ++animMeshIdx;
    }
--- a/code/AssetLib/USD/USDLoaderImplTinyusdz.h
+++ b/code/AssetLib/USD/USDLoaderImplTinyusdz.h
@@ -43,21 +43,29 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *  @brief Declaration of the USD importer class.
 */
 #pragma once
+
 #ifndef AI_USDLOADER_IMPL_TINYUSDZ_H_INCLUDED
 #define AI_USDLOADER_IMPL_TINYUSDZ_H_INCLUDED

+#include "tinyusdz.hh"
+#include "tydra/render-data.hh"
 #include <assimp/BaseImporter.h>
 #include <assimp/scene.h>
 #include <assimp/types.h>
-#include <vector>
 #include <cstdint>
-#include "tinyusdz.hh"
-#include "tydra/render-data.hh"
+#include <vector>

 namespace Assimp {
+
+/**
+ * @brief USD Importer implementation using tinyusdz.
+ */
 class USDImporterImplTinyusdz {
 public:
+    /// @brief The class constructor.
    USDImporterImplTinyusdz() = default;
+
+    /// @brief The class destructor.
    ~USDImporterImplTinyusdz() = default;

    void InternReadFile(
@@ -147,5 +155,7 @@ public:
            size_t meshIdx,
            const std::string &nameWExt);
 };
+
 } // namespace Assimp
+
 #endif // AI_USDLOADER_IMPL_TINYUSDZ_H_INCLUDED
--- a/code/AssetLib/glTF/glTFAsset.h
+++ b/code/AssetLib/glTF/glTFAsset.h
@@ -49,8 +49,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef GLTFASSET_H_INC
 #define GLTFASSET_H_INC

-#if !defined(ASSIMP_BUILD_NO_GLTF_IMPORTER) && !defined(ASSIMP_BUILD_NO_GLTF1_IMPORTER)
-
 #include "AssetLib/glTFCommon/glTFCommon.h"
 #include <assimp/Exceptional.h>
 #include <list>
@@ -1008,6 +1006,4 @@ private:
 // Include the implementation of the methods
 #include "glTFAsset.inl"

-#endif // ASSIMP_BUILD_NO_GLTF_IMPORTER
-
 #endif // GLTFASSET_H_INC
--- a/code/AssetLib/glTF/glTFAssetWriter.h
+++ b/code/AssetLib/glTF/glTFAssetWriter.h
@@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef GLTFASSETWRITER_H_INC
 #define GLTFASSETWRITER_H_INC

-#if !defined(ASSIMP_BUILD_NO_GLTF_IMPORTER) && !defined(ASSIMP_BUILD_NO_GLTF1_IMPORTER)
+//#if !defined(ASSIMP_BUILD_NO_GLTF_IMPORTER) && !defined(ASSIMP_BUILD_NO_GLTF1_IMPORTER)

 #include "glTFAsset.h"

@@ -63,16 +63,6 @@ class AssetWriter
    template<class T>
    friend void WriteLazyDict(LazyDict<T>& d, AssetWriter& w);

-private:
-
-    void WriteBinaryData(IOStream* outfile, size_t sceneLength);
-
-    void WriteMetadata();
-    void WriteExtensionsUsed();
-
-    template<class T>
-    void WriteObjects(LazyDict<T>& d);
-
 public:
    Document mDoc;
    Asset& mAsset;
@@ -80,9 +70,19 @@ public:
    MemoryPoolAllocator<>& mAl;

    AssetWriter(Asset& asset);
+    ~AssetWriter() = default;

    void WriteFile(const char* path);
    void WriteGLBFile(const char* path);
+
+private:
+    void WriteBinaryData(IOStream* outfile, size_t sceneLength);
+
+    void WriteMetadata();
+    void WriteExtensionsUsed();
+
+    template<class T>
+    void WriteObjects(LazyDict<T>& d);
 };

 }
@@ -90,6 +90,6 @@ public:
 // Include the implementation of the methods
 #include "glTFAssetWriter.inl"

-#endif // ASSIMP_BUILD_NO_GLTF_IMPORTER
+//#endif // ASSIMP_BUILD_NO_GLTF_IMPORTER

 #endif // GLTFASSETWRITER_H_INC
--- a/code/AssetLib/glTF/glTFExporter.cpp
+++ b/code/AssetLib/glTF/glTFExporter.cpp
@@ -42,6 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_GLTF_EXPORTER

 #include "AssetLib/glTF/glTFExporter.h"
+#include "AssetLib/glTF/glTFAsset.h"
 #include "AssetLib/glTF/glTFAssetWriter.h"
 #include "PostProcessing/SplitLargeMeshes.h"

@@ -62,6 +63,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <limits>
 #include <inttypes.h>

+#include <rapidjson/rapidjson.h>
+#include <rapidjson/document.h>
+#include <rapidjson/error/en.h>
+
 #ifdef ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC
 	// Header files, Open3DGC.
 #	include <Open3DGC/o3dgcSC3DMCEncoder.h>
@@ -1064,6 +1069,5 @@ void glTFExporter::ExportAnimations()
    } // End: for-loop mNumAnimations
 }

-
 #endif // ASSIMP_BUILD_NO_GLTF_EXPORTER
 #endif // ASSIMP_BUILD_NO_EXPORT
--- a/code/AssetLib/glTF2/glTF2Asset.h
+++ b/code/AssetLib/glTF2/glTF2Asset.h
@@ -58,7 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef GLTF2ASSET_H_INC
 #define GLTF2ASSET_H_INC

-#if !defined(ASSIMP_BUILD_NO_GLTF_IMPORTER) && !defined(ASSIMP_BUILD_NO_GLTF2_IMPORTER)
+//#if !defined(ASSIMP_BUILD_NO_GLTF_IMPORTER) && !defined(ASSIMP_BUILD_NO_GLTF2_IMPORTER)

 #include <assimp/Exceptional.h>

@@ -364,11 +364,8 @@ struct CustomExtension {
    }

    CustomExtension() = default;
-
    ~CustomExtension() = default;
-
    CustomExtension(const CustomExtension &other) = default;
-
    CustomExtension& operator=(const CustomExtension&) = default;
 };

@@ -423,7 +420,6 @@ public:
        Type_text
    };

-    /// \struct SEncodedRegion
    /// Descriptor of encoded region in "bufferView".
    struct SEncodedRegion {
        const size_t Offset; ///< Offset from begin of "bufferView" to encoded region, in bytes.
@@ -432,7 +428,6 @@ public:
        const size_t DecodedData_Length; ///< Size of decoded region, in bytes.
        const std::string ID; ///< ID of the region.

-        /// \fn SEncodedRegion(const size_t pOffset, const size_t pEncodedData_Length, uint8_t* pDecodedData, const size_t pDecodedData_Length, const std::string pID)
        /// Constructor.
        /// \param [in] pOffset - offset from begin of "bufferView" to encoded region, in bytes.
        /// \param [in] pEncodedData_Length - size of encoded region, in bytes.
@@ -446,7 +441,6 @@ public:
                DecodedData_Length(pDecodedData_Length),
                ID(pID) {}

-        /// \fn ~SEncodedRegion()
        /// Destructor.
        ~SEncodedRegion() { delete[] DecodedData; }
    };
@@ -460,7 +454,6 @@ public:

    Type type;

-    /// \var EncodedRegion_Current
    /// Pointer to currently active encoded region.
    /// Why not decoding all regions at once and not to set one buffer with decoded data?
    /// Yes, why not? Even "accessor" point to decoded data. I mean that fields "byteOffset", "byteStride" and "count" has values which describes decoded
@@ -500,7 +493,6 @@ public:

    bool LoadFromStream(IOStream &stream, size_t length = 0, size_t baseOffset = 0);

-    /// \fn void EncodedRegion_Mark(const size_t pOffset, const size_t pEncodedData_Length, uint8_t* pDecodedData, const size_t pDecodedData_Length, const std::string& pID)
    /// Mark region of "bufferView" as encoded. When data is request from such region then "bufferView" use decoded data.
    /// \param [in] pOffset - offset from begin of "bufferView" to encoded region, in bytes.
    /// \param [in] pEncodedData_Length - size of encoded region, in bytes.
@@ -509,12 +501,10 @@ public:
    /// \param [in] pID - ID of the region.
    void EncodedRegion_Mark(const size_t pOffset, const size_t pEncodedData_Length, uint8_t *pDecodedData, const size_t pDecodedData_Length, const std::string &pID);

-    /// \fn void EncodedRegion_SetCurrent(const std::string& pID)
    /// Select current encoded region by ID. \sa EncodedRegion_Current.
    /// \param [in] pID - ID of the region.
    void EncodedRegion_SetCurrent(const std::string &pID);

-    /// \fn bool ReplaceData(const size_t pBufferData_Offset, const size_t pBufferData_Count, const uint8_t* pReplace_Data, const size_t pReplace_Count)
    /// Replace part of buffer data. Pay attention that function work with original array of data (\ref mData) not with encoded regions.
    /// \param [in] pBufferData_Offset - index of first element in buffer from which new data will be placed.
    /// \param [in] pBufferData_Count - count of bytes in buffer which will be replaced.
@@ -1002,27 +992,24 @@ struct Texture : public Object {

 struct Animation : public Object {
    struct Sampler {
-        Sampler() :
-                interpolation(Interpolation_LINEAR) {}
+        Sampler() = default;

        Ref<Accessor> input; //!< Accessor reference to the buffer storing the key-frame times.
        Ref<Accessor> output; //!< Accessor reference to the buffer storing the key-frame values.
-        Interpolation interpolation; //!< Type of interpolation algorithm to use between key-frames.
+        Interpolation interpolation{Interpolation_LINEAR}; //!< Type of interpolation algorithm to use between key-frames.
    };

    struct Target {
-        Target() :
-                path(AnimationPath_TRANSLATION) {}
+        Target() = default;

        Ref<Node> node; //!< The node to animate.
-        AnimationPath path; //!< The property of the node to animate.
+        AnimationPath path{AnimationPath_TRANSLATION}; //!< The property of the node to animate.
    };

    struct Channel {
-        Channel() :
-                sampler(-1) {}
+        Channel() = default;

-        int sampler; //!< The sampler index containing the animation data.
+        int sampler{-1}; //!< The sampler index containing the animation data.
        Target target; //!< The node and property to animate.
    };

@@ -1135,50 +1122,34 @@ class Asset {
 public:
    //! Keeps info about the enabled extensions
    struct Extensions {
-        bool KHR_materials_pbrSpecularGlossiness;
-        bool KHR_materials_specular;
-        bool KHR_materials_unlit;
-        bool KHR_lights_punctual;
-        bool KHR_texture_transform;
-        bool KHR_materials_sheen;
-        bool KHR_materials_clearcoat;
-        bool KHR_materials_transmission;
-        bool KHR_materials_volume;
-        bool KHR_materials_ior;
-        bool KHR_materials_emissive_strength;
-        bool KHR_materials_anisotropy;
-        bool KHR_draco_mesh_compression;
-        bool FB_ngon_encoding;
-        bool KHR_texture_basisu;
+        bool KHR_materials_pbrSpecularGlossiness{false};
+        bool KHR_materials_specular{false};
+        bool KHR_materials_unlit{false};
+        bool KHR_lights_punctual{false};
+        bool KHR_texture_transform{false};
+        bool KHR_materials_sheen{false};
+        bool KHR_materials_clearcoat{false};
+        bool KHR_materials_transmission{false};
+        bool KHR_materials_volume{false};
+        bool KHR_materials_ior{false};
+        bool KHR_materials_emissive_strength{false};
+        bool KHR_materials_anisotropy{false};
+        bool KHR_draco_mesh_compression{false};
+        bool FB_ngon_encoding{false};
+        bool KHR_texture_basisu{false};
+        bool EXT_texture_webp{false};

-        Extensions() :
-                KHR_materials_pbrSpecularGlossiness(false),
-                KHR_materials_specular(false),
-                KHR_materials_unlit(false),
-                KHR_lights_punctual(false),
-                KHR_texture_transform(false),
-                KHR_materials_sheen(false),
-                KHR_materials_clearcoat(false),
-                KHR_materials_transmission(false),
-                KHR_materials_volume(false),
-                KHR_materials_ior(false),
-                KHR_materials_emissive_strength(false),
-                KHR_materials_anisotropy(false),
-                KHR_draco_mesh_compression(false),
-                FB_ngon_encoding(false),
-                KHR_texture_basisu(false) {
-            // empty
-        }
+        Extensions() = default;
+        ~Extensions() = default;
    } extensionsUsed;

    //! Keeps info about the required extensions
    struct RequiredExtensions {
-        bool KHR_draco_mesh_compression;
-        bool KHR_texture_basisu;
+        bool KHR_draco_mesh_compression{false};
+        bool KHR_texture_basisu{false};
+        bool EXT_texture_webp{false};

-        RequiredExtensions() : KHR_draco_mesh_compression(false), KHR_texture_basisu(false) {
-            // empty
-        }
+        RequiredExtensions() = default;
    } extensionsRequired;

    AssetMetadata asset;
@@ -1283,6 +1254,6 @@ inline std::string getContextForErrorMessages(const std::string &id, const std::
 // Include the implementation of the methods
 #include "glTF2Asset.inl"

-#endif // ASSIMP_BUILD_NO_GLTF_IMPORTER
+//#endif // ASSIMP_BUILD_NO_GLTF_IMPORTER

 #endif // GLTF2ASSET_H_INC
--- a/code/AssetLib/glTF2/glTF2Asset.inl
+++ b/code/AssetLib/glTF2/glTF2Asset.inl
@@ -1217,6 +1217,13 @@ inline void Texture::Read(Value &obj, Asset &r) {
        if (r.extensionsUsed.KHR_texture_basisu) {
            if (Value *curBasisU = FindObject(*extensions, "KHR_texture_basisu")) {

+                if (Value *sourceVal = FindUInt(*curBasisU, "source")) {
+                    source = r.images.Retrieve(sourceVal->GetUint());
+                }
+            }
+        } else if(r.extensionsUsed.EXT_texture_webp) {
+            if (Value *curBasisU = FindObject(*extensions, "EXT_texture_webp")) {
+
                if (Value *sourceVal = FindUInt(*curBasisU, "source")) {
                    source = r.images.Retrieve(sourceVal->GetUint());
                }
@@ -2149,6 +2156,7 @@ inline void Asset::ReadExtensionsRequired(Document &doc) {

    CHECK_REQUIRED_EXT(KHR_draco_mesh_compression);
    CHECK_REQUIRED_EXT(KHR_texture_basisu);
+    CHECK_REQUIRED_EXT(EXT_texture_webp);

 #undef CHECK_REQUIRED_EXT
 }
@@ -2179,6 +2187,7 @@ inline void Asset::ReadExtensionsUsed(Document &doc) {
    CHECK_EXT(KHR_materials_anisotropy);
    CHECK_EXT(KHR_draco_mesh_compression);
    CHECK_EXT(KHR_texture_basisu);
+    CHECK_EXT(EXT_texture_webp);

 #undef CHECK_EXT
 }
--- a/code/AssetLib/glTF2/glTF2AssetWriter.h
+++ b/code/AssetLib/glTF2/glTF2AssetWriter.h
@@ -57,8 +57,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef GLTF2ASSETWRITER_H_INC
 #define GLTF2ASSETWRITER_H_INC

-#if !defined(ASSIMP_BUILD_NO_GLTF_IMPORTER) && !defined(ASSIMP_BUILD_NO_GLTF2_IMPORTER)
-
 #include "glTF2Asset.h"

 namespace glTF2
@@ -98,6 +96,4 @@ public:
 // Include the implementation of the methods
 #include "glTF2AssetWriter.inl"

-#endif // ASSIMP_BUILD_NO_GLTF_IMPORTER
-
 #endif // GLTF2ASSETWRITER_H_INC
--- a/code/AssetLib/glTF2/glTF2Exporter.cpp
+++ b/code/AssetLib/glTF2/glTF2Exporter.cpp
@@ -64,6 +64,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <memory>
 #include <iostream>

+#include <rapidjson/rapidjson.h>
+#include <rapidjson/document.h>
+#include <rapidjson/error/en.h>
+
 using namespace rapidjson;

 using namespace Assimp;
--- a/code/AssetLib/glTF2/glTF2Exporter.h
+++ b/code/AssetLib/glTF2/glTF2Exporter.h
@@ -45,8 +45,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_GLTF2EXPORTER_H_INC
 #define AI_GLTF2EXPORTER_H_INC

-#if !defined(ASSIMP_BUILD_NO_GLTF_IMPORTER) && !defined(ASSIMP_BUILD_NO_GLTF2_IMPORTER)
-
 #include <assimp/material.h>
 #include <assimp/types.h>
 #include <assimp/defs.h>
@@ -150,6 +148,4 @@ private:

 } // namespace Assimp

-#endif // ASSIMP_BUILD_NO_GLTF_IMPORTER
-
 #endif // AI_GLTF2EXPORTER_H_INC
--- a/code/AssetLib/glTF2/glTF2Importer.cpp
+++ b/code/AssetLib/glTF2/glTF2Importer.cpp
@@ -65,6 +65,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #include <rapidjson/document.h>
 #include <rapidjson/rapidjson.h>
+#include <rapidjson/error/en.h>

 using namespace Assimp;
 using namespace glTF2;
@@ -1662,7 +1663,7 @@ void glTF2Importer::ImportEmbeddedTextures(glTF2::Asset &r) {
                    ext = "kx2";
                } else if (strcmp(ext, "basis") == 0) { // basisu
                    ext = "bu";
-                }
+                } // webp requires no transformation

                size_t len = strlen(ext);
                if (len > 3) len = 3;
@@ -1680,7 +1681,8 @@ void glTF2Importer::ImportCommonMetadata(glTF2::Asset &a) {
    const bool hasGenerator = !a.asset.generator.empty();
    const bool hasCopyright = !a.asset.copyright.empty();
    const bool hasSceneMetadata = a.scene->customExtensions;
-    if (hasVersion || hasGenerator || hasCopyright || hasSceneMetadata) {
+    const bool hasSceneExtras = a.scene->extras.HasExtras();
+    if (hasVersion || hasGenerator || hasCopyright || hasSceneMetadata || hasSceneExtras) {
        mScene->mMetaData = new aiMetadata;
        if (hasVersion) {
            mScene->mMetaData->Add(AI_METADATA_SOURCE_FORMAT_VERSION, aiString(a.asset.version));
@@ -1694,6 +1696,9 @@ void glTF2Importer::ImportCommonMetadata(glTF2::Asset &a) {
        if (hasSceneMetadata) {
            ParseExtensions(mScene->mMetaData, a.scene->customExtensions);
        }
+        if (hasSceneExtras) {
+            ParseExtras(mScene->mMetaData, a.scene->extras);
+        }
    }
 }

--- a/code/AssetLib/glTFCommon/glTFCommon.cpp
+++ b/code/AssetLib/glTFCommon/glTFCommon.cpp
@@ -38,15 +38,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 ----------------------------------------------------------------------
 */
-#ifndef ASSIMP_BUILD_NO_GLTF_IMPORTER
-
 #include "AssetLib/glTFCommon/glTFCommon.h"

-namespace glTFCommon {
-
 using namespace glTFCommon::Util;

-namespace Util {
+namespace glTFCommon::Util {

 bool ParseDataURI(const char *const_uri, size_t uriLen, DataURI &out) {
    if (nullptr == const_uri) {
@@ -111,7 +107,4 @@ bool ParseDataURI(const char *const_uri, size_t uriLen, DataURI &out) {
    return true;
 }

-} // namespace Util
-} // namespace glTFCommon
-
-#endif
+} // namespace glTFCommon::Uti
--- a/code/AssetLib/glTFCommon/glTFCommon.h
+++ b/code/AssetLib/glTFCommon/glTFCommon.h
@@ -41,8 +41,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_GLFTCOMMON_H_INC
 #define AI_GLFTCOMMON_H_INC

-#ifndef ASSIMP_BUILD_NO_GLTF_IMPORTER
-
 #include <assimp/Exceptional.h>
 #include <assimp/DefaultLogger.hpp>

@@ -532,6 +530,4 @@ inline Value *FindNumber(Value &val, const char *id) {

 } // namespace glTFCommon

-#endif // ASSIMP_BUILD_NO_GLTF_IMPORTER
-
 #endif // AI_GLFTCOMMON_H_INC
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -602,6 +602,12 @@ ADD_ASSIMP_IMPORTER( XGL
  AssetLib/XGL/XGLLoader.h
 )

+SET( FBX_COMMON_SRCS
+  AssetLib/FBX/FBXUtil.h
+  AssetLib/FBX/FBXUtil.cpp
+  AssetLib/FBX/FBXCommon.h
+)
+
 ADD_ASSIMP_IMPORTER( FBX
  AssetLib/FBX/FBXImporter.cpp
  AssetLib/FBX/FBXCompileConfig.h
@@ -613,8 +619,6 @@ ADD_ASSIMP_IMPORTER( FBX
  AssetLib/FBX/FBXImportSettings.h
  AssetLib/FBX/FBXConverter.h
  AssetLib/FBX/FBXConverter.cpp
-  AssetLib/FBX/FBXUtil.h
-  AssetLib/FBX/FBXUtil.cpp
  AssetLib/FBX/FBXDocument.h
  AssetLib/FBX/FBXDocument.cpp
  AssetLib/FBX/FBXProperties.h
@@ -628,7 +632,6 @@ ADD_ASSIMP_IMPORTER( FBX
  AssetLib/FBX/FBXDeformer.cpp
  AssetLib/FBX/FBXBinaryTokenizer.cpp
  AssetLib/FBX/FBXDocumentUtil.cpp
-  AssetLib/FBX/FBXCommon.h
 )

 if (NOT ASSIMP_NO_EXPORT)
@@ -1348,6 +1351,8 @@ SET( assimp_src
  ${ASSIMP_LOADER_SRCS}
  ${ASSIMP_EXPORTER_SRCS}

+  ${FBX_COMMON_SRCS}
+  
  # Third-party libraries
  ${unzip_compile_SRCS}
  ${Poly2Tri_SRCS}
--- a/contrib/stb/stb_image.h
+++ b/contrib/stb/stb_image.h
@@ -1,4 +1,4 @@
-/* stb_image - v2.29 - public domain image loader - http://nothings.org/stb
+/* stb_image - v2.30 - public domain image loader - http://nothings.org/stb
                                  no warranty implied; use at your own risk

   Do this:
@@ -48,6 +48,7 @@ LICENSE

 RECENT REVISION HISTORY:

+      2.30  (2024-05-31) avoid erroneous gcc warning
      2.29  (2023-05-xx) optimizations
      2.28  (2023-01-29) many error fixes, security errors, just tons of stuff
      2.27  (2021-07-11) document stbi_info better, 16-bit PNM support, bug fixes
@@ -5159,9 +5160,11 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp)
               // non-paletted with tRNS = constant alpha. if header-scanning, we can stop now.
               if (scan == STBI__SCAN_header) { ++s->img_n; return 1; }
               if (z->depth == 16) {
-                  for (k = 0; k < s->img_n; ++k) tc16[k] = (stbi__uint16)stbi__get16be(s); // copy the values as-is
+                  for (k = 0; k < s->img_n && k < 3; ++k) // extra loop test to suppress false GCC warning
+                     tc16[k] = (stbi__uint16)stbi__get16be(s); // copy the values as-is
               } else {
-                  for (k = 0; k < s->img_n; ++k) tc[k] = (stbi_uc)(stbi__get16be(s) & 255) * stbi__depth_scale_table[z->depth]; // non 8-bit images will be larger
+                  for (k = 0; k < s->img_n && k < 3; ++k)
+                     tc[k] = (stbi_uc)(stbi__get16be(s) & 255) * stbi__depth_scale_table[z->depth]; // non 8-bit images will be larger
               }
            }
            break;
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -32,19 +32,19 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.

-PROJECT_NAME           = "My Project"
+PROJECT_NAME           = "The Open Asset Importer Lib"

 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         =
+PROJECT_NUMBER         = "6.0.2"

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.

-PROJECT_BRIEF          =
+PROJECT_BRIEF          = The official Open-Asset-Importer-Library Repository. Loads 40+ 3D-file-formats into one unified and clean data structure.

 # With the PROJECT_LOGO tag one can specify a logo or an icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55
@@ -58,7 +58,7 @@ PROJECT_LOGO           =
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.

-OUTPUT_DIRECTORY       =
+OUTPUT_DIRECTORY       = out

 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and
--- a/fuzz/assimp_fuzzer.cc
+++ b/fuzz/assimp_fuzzer.cc
@@ -47,6 +47,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 using namespace Assimp;

 extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t dataSize) {
+    // Limit input size to 1MB to prevent OOMs and timeouts
+    if (dataSize > 1024 * 1024) {
+        return 0;
+    }
+
 #ifdef _DEBUG
    aiLogStream stream = aiGetPredefinedLogStream(aiDefaultLogStream_STDOUT, nullptr);
    aiAttachLogStream(&stream);
--- a/fuzz/assimp_fuzzer.dict
+++ b/fuzz/assimp_fuzzer.dict
@@ -0,0 +1,40 @@
+# OBJ
+"v "
+"vn "
+"vt "
+"f "
+"mtllib "
+"usemtl "
+
+# GLTF (JSON)
+"asset"
+"scene"
+"scenes"
+"nodes"
+"meshes"
+"accessors"
+"bufferViews"
+"buffers"
+
+# PLY
+"ply"
+"format"
+"element"
+"property"
+"vertex"
+"face"
+
+# STL
+"solid"
+"facet"
+"normal"
+"outer loop"
+"vertex"
+"endloop"
+"endfacet"
+"endsolid"
+
+# Collada (XML)
+"COLLADA"
+"library_geometries"
+"library_visual_scenes"
--- a/fuzz/assimp_fuzzer_collada.cc
+++ b/fuzz/assimp_fuzzer_collada.cc
@@ -0,0 +1,63 @@
+/*
+---------------------------------------------------------------------------
+Open Asset Import Library (assimp)
+---------------------------------------------------------------------------
+
+Copyright (c) 2006-2025, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms,
+with or without modification, are permitted provided that the following
+conditions are met:
+
+* Redistributions of source code must retain the above
+  copyright notice, this list of conditions and the
+  following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the
+  following disclaimer in the documentation and/or other
+  materials provided with the distribution.
+
+* Neither the name of the assimp team, nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission of the assimp team.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+---------------------------------------------------------------------------
+*/
+#include "fuzzer_common.h"
+#include <assimp/cimport.h>
+#include <assimp/scene.h>
+#include <assimp/postprocess.h>
+
+using namespace Assimp;
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t dataSize) {
+    if (dataSize > 1024 * 1024) {
+        return 0;
+    }
+
+    Importer importer;
+    // Force Collada format (dae)
+    if (!AssimpFuzz::ForceFormat(importer, "dae")) {
+        return 0;
+    }
+
+    unsigned int flags = aiProcessPreset_TargetRealtime_Quality | aiProcess_ValidateDataStructure;
+    const aiScene *sc = importer.ReadFileFromMemory(data, dataSize, flags, "dae");
+
+    return 0;
+}
--- a/tools/coverity/assimp_modeling.cpp
+++ b/tools/coverity/assimp_modeling.cpp
@@ -1,13 +1,15 @@
 /*
+---------------------------------------------------------------------------
 Open Asset Import Library (assimp)
----------------------------------------------------------------------
+---------------------------------------------------------------------------
+
+Copyright (c) 2006-2025, assimp team

-Copyright (c) 2006-2020, assimp team
 All rights reserved.

 Redistribution and use of this software in source and binary forms,
-with or without modification, are permitted provided that the
-following conditions are met:
+with or without modification, are permitted provided that the following
+conditions are met:

 * Redistributions of source code must retain the above
  copyright notice, this list of conditions and the
@@ -34,7 +36,28 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
----------------------------------------------------------------------
+---------------------------------------------------------------------------
 */
-//
+#include "fuzzer_common.h"
+#include <assimp/cimport.h>
+#include <assimp/scene.h>
+#include <assimp/postprocess.h>
+
+using namespace Assimp;
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t dataSize) {
+    if (dataSize > 1024 * 1024) {
+        return 0;
+    }
+
+    Importer importer;
+    // Force FBX format
+    if (!AssimpFuzz::ForceFormat(importer, "fbx")) {
+        return 0;
+    }
+
+    unsigned int flags = aiProcessPreset_TargetRealtime_Quality | aiProcess_ValidateDataStructure;
+    const aiScene *sc = importer.ReadFileFromMemory(data, dataSize, flags, "fbx");
+
+    return 0;
+}
--- a/fuzz/assimp_fuzzer_glb.cc
+++ b/fuzz/assimp_fuzzer_glb.cc
@@ -0,0 +1,63 @@
+/*
+---------------------------------------------------------------------------
+Open Asset Import Library (assimp)
+---------------------------------------------------------------------------
+
+Copyright (c) 2006-2025, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms,
+with or without modification, are permitted provided that the following
+conditions are met:
+
+* Redistributions of source code must retain the above
+  copyright notice, this list of conditions and the
+  following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the
+  following disclaimer in the documentation and/or other
+  materials provided with the distribution.
+
+* Neither the name of the assimp team, nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission of the assimp team.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+---------------------------------------------------------------------------
+*/
+#include "fuzzer_common.h"
+#include <assimp/cimport.h>
+#include <assimp/scene.h>
+#include <assimp/postprocess.h>
+
+using namespace Assimp;
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t dataSize) {
+    if (dataSize > 1024 * 1024) {
+        return 0;
+    }
+
+    Importer importer;
+    // Force GLB binary format only (see assimp_fuzzer_gltf.cc for text glTF)
+    if (!AssimpFuzz::ForceFormat(importer, "glb")) {
+        return 0;
+    }
+
+    unsigned int flags = aiProcessPreset_TargetRealtime_Quality | aiProcess_ValidateDataStructure;
+    const aiScene *sc = importer.ReadFileFromMemory(data, dataSize, flags, "glb");
+
+    return 0;
+}
--- a/fuzz/assimp_fuzzer_gltf.cc
+++ b/fuzz/assimp_fuzzer_gltf.cc
@@ -0,0 +1,63 @@
+/*
+---------------------------------------------------------------------------
+Open Asset Import Library (assimp)
+---------------------------------------------------------------------------
+
+Copyright (c) 2006-2025, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms,
+with or without modification, are permitted provided that the following
+conditions are met:
+
+* Redistributions of source code must retain the above
+  copyright notice, this list of conditions and the
+  following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the
+  following disclaimer in the documentation and/or other
+  materials provided with the distribution.
+
+* Neither the name of the assimp team, nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission of the assimp team.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+---------------------------------------------------------------------------
+*/
+#include "fuzzer_common.h"
+#include <assimp/cimport.h>
+#include <assimp/scene.h>
+#include <assimp/postprocess.h>
+
+using namespace Assimp;
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t dataSize) {
+    if (dataSize > 1024 * 1024) {
+        return 0;
+    }
+
+    Importer importer;
+    // Force glTF text format only (see assimp_fuzzer_glb.cc for binary GLB)
+    if (!AssimpFuzz::ForceFormat(importer, "gltf")) {
+        return 0;
+    }
+
+    unsigned int flags = aiProcessPreset_TargetRealtime_Quality | aiProcess_ValidateDataStructure;
+    const aiScene *sc = importer.ReadFileFromMemory(data, dataSize, flags, "gltf");
+
+    return 0;
+}
--- a/fuzz/assimp_fuzzer_obj.cc
+++ b/fuzz/assimp_fuzzer_obj.cc
@@ -0,0 +1,65 @@
+/*
+---------------------------------------------------------------------------
+Open Asset Import Library (assimp)
+---------------------------------------------------------------------------
+
+Copyright (c) 2006-2025, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms,
+with or without modification, are permitted provided that the following
+conditions are met:
+
+* Redistributions of source code must retain the above
+  copyright notice, this list of conditions and the
+  following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the
+  following disclaimer in the documentation and/or other
+  materials provided with the distribution.
+
+* Neither the name of the assimp team, nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission of the assimp team.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+---------------------------------------------------------------------------
+*/
+#include "fuzzer_common.h"
+#include <assimp/cimport.h>
+#include <assimp/scene.h>
+#include <assimp/postprocess.h>
+
+using namespace Assimp;
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t dataSize) {
+    // Limit input size to 1MB
+    if (dataSize > 1024 * 1024) {
+        return 0;
+    }
+
+    Importer importer;
+    // Force OBJ format
+    if (!AssimpFuzz::ForceFormat(importer, "obj")) {
+        return 0;
+    }
+
+    unsigned int flags = aiProcessPreset_TargetRealtime_Quality | aiProcess_ValidateDataStructure;
+    // We pass "obj" hint as well, though only OBJ loader is registered now.
+    const aiScene *sc = importer.ReadFileFromMemory(data, dataSize, flags, "obj");
+
+    return 0;
+}
--- a/fuzz/assimp_fuzzer_stl.cc
+++ b/fuzz/assimp_fuzzer_stl.cc
@@ -0,0 +1,63 @@
+/*
+---------------------------------------------------------------------------
+Open Asset Import Library (assimp)
+---------------------------------------------------------------------------
+
+Copyright (c) 2006-2025, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms,
+with or without modification, are permitted provided that the following
+conditions are met:
+
+* Redistributions of source code must retain the above
+  copyright notice, this list of conditions and the
+  following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the
+  following disclaimer in the documentation and/or other
+  materials provided with the distribution.
+
+* Neither the name of the assimp team, nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission of the assimp team.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+---------------------------------------------------------------------------
+*/
+#include "fuzzer_common.h"
+#include <assimp/cimport.h>
+#include <assimp/scene.h>
+#include <assimp/postprocess.h>
+
+using namespace Assimp;
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t dataSize) {
+    if (dataSize > 1024 * 1024) {
+        return 0;
+    }
+
+    Importer importer;
+    // Force STL format
+    if (!AssimpFuzz::ForceFormat(importer, "stl")) {
+        return 0;
+    }
+
+    unsigned int flags = aiProcessPreset_TargetRealtime_Quality | aiProcess_ValidateDataStructure;
+    const aiScene *sc = importer.ReadFileFromMemory(data, dataSize, flags, "stl");
+
+    return 0;
+}
--- a/fuzz/fuzzer_common.h
+++ b/fuzz/fuzzer_common.h
@@ -0,0 +1,107 @@
+/*
+---------------------------------------------------------------------------
+Open Asset Import Library (assimp)
+---------------------------------------------------------------------------
+
+Copyright (c) 2006-2025, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms,
+with or without modification, are permitted provided that the following
+conditions are met:
+
+* Redistributions of source code must retain the above
+  copyright notice, this list of conditions and the
+  following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the
+  following disclaimer in the documentation and/or other
+  materials provided with the distribution.
+
+* Neither the name of the assimp team, nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission of the assimp team.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+---------------------------------------------------------------------------
+*/
+#pragma once
+
+#include <assimp/Importer.hpp>
+#include <assimp/BaseImporter.h>
+#include <assimp/importerdesc.h>
+#include <cstring>
+#include <vector>
+
+namespace AssimpFuzz {
+
+// Unregisters all loaders except the ones matching the given extension.
+// Returns true if at least one loader was kept.
+inline bool ForceFormat(Assimp::Importer& importer, const char* targetExtension) {
+    size_t count = importer.GetImporterCount();
+    std::vector<Assimp::BaseImporter*> toRemove;
+    bool found = false;
+
+    for (size_t i = 0; i < count; ++i) {
+        const aiImporterDesc* desc = importer.GetImporterInfo(i);
+        Assimp::BaseImporter* imp = importer.GetImporter(i);
+        
+        if (!desc || !imp) continue;
+
+        // Check if the importer supports the target extension
+        // mFileExtensions is a space-separated list (e.g., "obj mod")
+        // We wrap target in spaces or check bounds to be precise, 
+        // but for fuzzing, a simple strstr is usually sufficient 
+        // if the target string is unique enough (e.g. "gltf", "obj").
+        // A more robust check:
+        
+        bool isTarget = false;
+        const char* extList = desc->mFileExtensions;
+        if (!extList) {
+            toRemove.push_back(imp);
+            continue;
+        }
+        const size_t targetLen = strlen(targetExtension);
+
+        const char* p = extList;
+        while ((p = strstr(p, targetExtension)) != nullptr) {
+            // Check boundaries
+            const char prev = (p == extList) ? ' ' : *(p - 1);
+            const char next = *(p + targetLen);
+            
+            if (prev == ' ' && (next == ' ' || next == '\0')) {
+                isTarget = true;
+                break;
+            }
+            p++;
+        }
+
+        if (isTarget) {
+            found = true;
+        } else {
+            toRemove.push_back(imp);
+        }
+    }
+
+    for (auto* imp : toRemove) {
+        importer.UnregisterLoader(imp);
+        delete imp;  // Free the unregistered importer to prevent memory leaks
+    }
+
+    return found;
+}
+
+}
--- a/fuzz/ossfuzz/Dockerfile
+++ b/fuzz/ossfuzz/Dockerfile
@@ -0,0 +1,22 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+
+FROM gcr.io/oss-fuzz-base/base-builder
+RUN apt-get update && apt-get install -y make autoconf automake libtool ninja-build cmake zip
+
+RUN git clone --depth 1 https://github.com/assimp/assimp.git assimp
+WORKDIR assimp
+COPY build.sh $SRC/
--- a/fuzz/ossfuzz/build.sh
+++ b/fuzz/ossfuzz/build.sh
@@ -0,0 +1,100 @@
+#!/bin/bash -eu
+
+# Build directory
+mkdir -p build
+cd build
+
+# Configure
+cmake .. \
+  -G Ninja \
+  -DCMAKE_C_COMPILER="${CC}" \
+  -DCMAKE_CXX_COMPILER="${CXX}" \
+  -DCMAKE_C_FLAGS="${CFLAGS}" \
+  -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
+  -DASSIMP_BUILD_ZLIB=ON \
+  -DASSIMP_BUILD_TESTS=OFF \
+  -DASSIMP_BUILD_ASSIMP_TOOLS=OFF \
+  -DBUILD_SHARED_LIBS=OFF \
+  -DASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT=ON \
+  -DASSIMP_BUILD_ALL_EXPORTERS_BY_DEFAULT=ON
+
+# Build the library
+ninja
+
+# Helper function to build fuzzers
+build_fuzzer() {
+    local fuzzer_name=$1
+    local source_file=$2
+
+    echo "Building $fuzzer_name..."
+    $CXX $CXXFLAGS -I../include -I../build/include -c "$source_file" -o "${fuzzer_name}.o"
+
+    $CXX $CXXFLAGS $LIB_FUZZING_ENGINE "${fuzzer_name}.o" -o "$OUT/${fuzzer_name}" \
+        ./lib/libassimp.a \
+        ./contrib/zlib/libzlibstatic.a \
+        -lpthread -ldl
+}
+
+# 1. Generic Fuzzer
+build_fuzzer "assimp_fuzzer" "../fuzz/assimp_fuzzer.cc"
+# Corpus for generic fuzzer (all models)
+(cd ../test/models && zip -q -r $OUT/assimp_fuzzer_seed_corpus.zip .)
+# Dictionary
+cp ../fuzz/assimp_fuzzer.dict $OUT/assimp_fuzzer.dict || true
+
+
+# 2. OBJ Fuzzer
+build_fuzzer "assimp_fuzzer_obj" "../fuzz/assimp_fuzzer_obj.cc"
+if [ -d "../test/models/OBJ" ]; then
+    (cd ../test/models/OBJ && zip -q -r $OUT/assimp_fuzzer_obj_seed_corpus.zip .)
+fi
+cp ../fuzz/assimp_fuzzer.dict $OUT/assimp_fuzzer_obj.dict || true
+
+
+# 3. GLTF Fuzzer (text format only, glTF and glTF2 versions)
+build_fuzzer "assimp_fuzzer_gltf" "../fuzz/assimp_fuzzer_gltf.cc"
+mkdir -p gltf_corpus
+[ -d "../test/models/glTF" ] && cp -r ../test/models/glTF/* gltf_corpus/
+[ -d "../test/models/glTF2" ] && cp -r ../test/models/glTF2/* gltf_corpus/
+if [ -d "gltf_corpus" ] && [ "$(ls -A gltf_corpus)" ]; then
+    (cd gltf_corpus && zip -q -r $OUT/assimp_fuzzer_gltf_seed_corpus.zip .)
+fi
+rm -rf gltf_corpus
+cp ../fuzz/assimp_fuzzer.dict $OUT/assimp_fuzzer_gltf.dict || true
+
+
+# 4. GLB Fuzzer (binary glTF format)
+build_fuzzer "assimp_fuzzer_glb" "../fuzz/assimp_fuzzer_glb.cc"
+mkdir -p glb_corpus
+# GLB files can be found in glTF and glTF2 directories
+[ -d "../test/models/glTF" ] && find ../test/models/glTF -name "*.glb" -exec cp {} glb_corpus/ \; 2>/dev/null || true
+[ -d "../test/models/glTF2" ] && find ../test/models/glTF2 -name "*.glb" -exec cp {} glb_corpus/ \; 2>/dev/null || true
+if [ -d "glb_corpus" ] && [ "$(ls -A glb_corpus)" ]; then
+    (cd glb_corpus && zip -q -r $OUT/assimp_fuzzer_glb_seed_corpus.zip .)
+fi
+rm -rf glb_corpus
+cp ../fuzz/assimp_fuzzer.dict $OUT/assimp_fuzzer_glb.dict || true
+
+
+# 5. FBX Fuzzer
+build_fuzzer "assimp_fuzzer_fbx" "../fuzz/assimp_fuzzer_fbx.cc"
+if [ -d "../test/models/FBX" ]; then
+    (cd ../test/models/FBX && zip -q -r $OUT/assimp_fuzzer_fbx_seed_corpus.zip .)
+fi
+cp ../fuzz/assimp_fuzzer.dict $OUT/assimp_fuzzer_fbx.dict || true
+
+
+# 6. Collada Fuzzer
+build_fuzzer "assimp_fuzzer_collada" "../fuzz/assimp_fuzzer_collada.cc"
+if [ -d "../test/models/Collada" ]; then
+    (cd ../test/models/Collada && zip -q -r $OUT/assimp_fuzzer_collada_seed_corpus.zip .)
+fi
+cp ../fuzz/assimp_fuzzer.dict $OUT/assimp_fuzzer_collada.dict || true
+
+
+# 7. STL Fuzzer
+build_fuzzer "assimp_fuzzer_stl" "../fuzz/assimp_fuzzer_stl.cc"
+if [ -d "../test/models/STL" ]; then
+    (cd ../test/models/STL && zip -q -r $OUT/assimp_fuzzer_stl_seed_corpus.zip .)
+fi
+cp ../fuzz/assimp_fuzzer.dict $OUT/assimp_fuzzer_stl.dict || true
--- a/fuzz/ossfuzz/project.yaml
+++ b/fuzz/ossfuzz/project.yaml
@@ -0,0 +1,14 @@
+homepage: "https://github.com/assimp/assimp"
+main_repo: "https://github.com/assimp/assimp"
+language: c++
+primary_contact: "kim.kulling@assimp.org"
+auto_ccs:
+  - "kim.kulling@googlemail.com"
+sanitizers:
+  - address
+  - undefined
+  - memory
+fuzzing_engines:
+  - libfuzzer
+  - afl
+  - honggfuzz
--- a/include/assimp/LineSplitter.h
+++ b/include/assimp/LineSplitter.h
@@ -79,13 +79,14 @@ for(LineSplitter splitter(stream);splitter;++splitter) {
 class LineSplitter {
 public:
    /// The current line index in the data block.
-    typedef size_t line_idx;
+    using line_idx = size_t;

    // -----------------------------------------
    /// @brief The class constructor.
    /// @note  trim is *always* assumed true if skyp_empty_lines==true
    LineSplitter(StreamReaderLE& stream, bool skip_empty_lines = true, bool trim = true);

+    // -----------------------------------------    
    /// @brief The class destructor.
    ~LineSplitter() = default;

@@ -98,7 +99,9 @@ public:
    LineSplitter& operator++(int);

    // -----------------------------------------
-    /** get a pointer to the beginning of a particular token */
+    /// @brief  Get a pointer to the beginning of a particular token.
+    /// @param  idx     The index into the token.
+    /// @return The token.
    const char* operator[] (size_t idx) const;

    // -----------------------------------------
@@ -107,9 +110,11 @@ public:
    void get_tokens(const char* (&tokens)[N]) const;

    // -----------------------------------------
-    /** member access */
+    /// member access via -> operator.
    const std::string* operator -> () const;

+    // -----------------------------------------
+    /// member access via * operator.
    std::string operator* () const;
    
    /// @brief  Will return the end marker, end of the buffer plus one.
@@ -117,11 +122,11 @@ public:
    const char *getEnd() const;

    // -----------------------------------------
-    /** boolean context */
+    /// boolean context.
    operator bool() const;

    // -----------------------------------------
-    /** line indices are zero-based, empty lines are included */
+    /// line indices are zero-based, empty lines are included
    operator line_idx() const;

    /// @brief  Will return the current index.
@@ -129,15 +134,17 @@ public:
    line_idx get_index() const;

    // -----------------------------------------
-    /** access the underlying stream object */
+    /// @brief Access the underlying stream object.
+    /// @return Reference to the stream reader.
    StreamReaderLE& get_stream();

    // -----------------------------------------
-    /** !strcmp((*this)->substr(0,strlen(check)),check) */
+    /// !strcmp((*this)->substr(0,strlen(check)),check)
+    /// @return true if token matches.
    bool match_start(const char* check);

    // -----------------------------------------
-    /** swallow the next call to ++, return the previous value. */
+    /// @brief Swallow the next call to ++, return the previous value.
    void swallow_next_increment();

    LineSplitter( const LineSplitter & ) = delete;
--- a/port/AndroidJNI/AndroidJNIIOSystem.cpp
+++ b/port/AndroidJNI/AndroidJNIIOSystem.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2021, assimp team
+Copyright (c) 2006-2025, assimp team

 All rights reserved.

--- a/port/AndroidJNI/BundledAssetIOSystem.cpp
+++ b/port/AndroidJNI/BundledAssetIOSystem.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2021, assimp team
+Copyright (c) 2006-2025, assimp team

 All rights reserved.

--- a/port/PyAssimp/gen/materialgen.py
+++ b/port/PyAssimp/gen/materialgen.py
@@ -5,7 +5,7 @@
 # Open Asset Import Library (ASSIMP)
 # ---------------------------------------------------------------------------
 #
-# Copyright (c) 2006-2020, ASSIMP Development Team
+# Copyright (c) 2006-2025, ASSIMP Development Team
 #
 # All rights reserved.
 #
--- a/port/PyAssimp/gen/structsgen.py
+++ b/port/PyAssimp/gen/structsgen.py
@@ -5,7 +5,7 @@
 # Open Asset Import Library (ASSIMP)
 # ---------------------------------------------------------------------------
 #
-# Copyright (c) 2006-2020, ASSIMP Development Team
+# Copyright (c) 2006-2025, ASSIMP Development Team
 #
 # All rights reserved.
 #
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -147,8 +147,6 @@ SET( IMPORTERS
  unit/utBlendImportMaterials.cpp
  unit/utBlenderWork.cpp
  unit/utBVHImportExport.cpp
-  unit/utColladaExport.cpp
-  unit/utColladaImportExport.cpp
  unit/utCSMImportExport.cpp
  unit/utB3DImportExport.cpp
  #unit/utM3DImportExport.cpp
@@ -180,6 +178,18 @@ if(ASSIMP_BUILD_USD_IMPORTER)
  )
 endif()

+if(ASSIMP_BUILD_COLLADA_EXPORTER)
+  list( APPEND IMPORTERS
+    unit/utColladaExport.cpp
+  )
+endif()
+
+if(ASSIMP_BUILD_COLLADA_IMPORTER)
+  list( APPEND IMPORTERS
+    unit/utColladaImportExport.cpp
+  )
+endif()
+
 SET( MATERIAL
  unit/utMaterialSystem.cpp
 )
--- a/test/other/streamload.py
+++ b/test/other/streamload.py
@@ -1,68 +0,0 @@
-#!/usr/bin/env python3
-
-"""Read all test files for a particular file format using a single
-importer instance. Read them again in reversed order. This is used
-to verify that a loader does proper cleanup and can be called
-repeatedly."""
-
-import sys
-import os
-import subprocess
-
-# hack-load utils.py and settings.py from ../regression
-sys.path.append(os.path.join('..','regression'))
-
-import utils
-import settings
-
-
-def process_dir(thisdir):
-    """Process /thisdir/ recursively"""
-    res = []
-    shellparams = {'stdin':subprocess.PIPE,'stdout':sys.stdout,'shell':True}
-
-    command = [utils.assimp_bin_path,"testbatchload"]
-    for f in os.listdir(thisdir):
-        if os.path.splitext(f)[-1] in settings.exclude_extensions:
-            continue
-        fullpath = os.path.join(thisdir, f)
-        if os.path.isdir(fullpath):
-            if f != ".svn":
-                res += process_dir(fullpath) 
-            continue
-
-        # import twice, importing the same file again introduces extra risk
-        # to crash due to garbage data lying around in the importer.
-        command.append(fullpath)
-        command.append(fullpath)
-
-    if len(command)>2:
-        # testbatchload returns always 0 if more than one file in the list worked.
-        # however, if it should segfault, the OS will return something not 0.
-        command += reversed(command[2:])
-        if subprocess.call(command, **shellparams):
-            res.append(thisdir)
-
-
-    return res
-
-
-def main():
-    """Run the test on all registered test repositories"""
-    utils.find_assimp_or_die()
-    
-    res = []
-    for tp in settings.model_directories:
-        res += process_dir(tp)
-
-    [print(f) for f in res]
-    return 0
-
-
-if __name__ == '__main__':
-    res = main()
-    input('All done, waiting for keystroke ')
-
-    sys.exit(res)
-
-# vim: ai ts=4 sts=4 et sw=4
--- a/test/regression/.project
+++ b/test/regression/.project
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>assimp-regression</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.python.pydev.PyDevBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.python.pydev.pythonNature</nature>
-	</natures>
-</projectDescription>
--- a/test/regression/.pydevproject
+++ b/test/regression/.pydevproject
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse-pydev version="1.0"?>
-
-<pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 3.0</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
-</pydev_project>
--- a/test/regression/README.txt
+++ b/test/regression/README.txt
@@ -1,95 +0,0 @@
-Asset Importer Lib Regression Test Suite
-========================================
-
-1) How does it work?
---------------------------------------------------------------------------------
-run.py checks all model in the <root>/test/models* folders and compares the result
-against a regression database provided with assimp (db.zip). A few failures
-are totally fine (see sections 7+). You need to worry if a huge
-majority of all files in a particular format (or post-processing configuration)
-fails as this might be a sign of a recent regression in assimp's codebase or
-gross incompatibility with your system or compiler.
-
-2) What do I need?
---------------------------------------------------------------------------------
- - You need Python installed (2.7+, 3.x). On Windows, run the scripts using "py".
- - You need to build the assimp command line tool (ASSIMP_BUILD_ASSIMP_TOOLS
-   CMake build flag). Both run.py and gen_db.py take the full path to the binary
-   as first command line parameter.
-
-3) How to add more test files?
---------------------------------------------------------------------------------
-Use the following procedure:
- - Verify the correctness of your assimp build - run the regression suite.
-   DO NOT continue if more tests fail than usual.
- - Add your additional test files to <root>/test/models/<fileformat>, where
-   <fileformat> is the file type (typically the file extension).
- - If you test file does not meet the BSD license requirements, add it to
-   <root>/test/models-nonbsd/<fileformat> so people know to be careful with it.
- - Rebuild the regression database:
-   "gen_db.py <binary> -ixyz" where .xyz is the file extension of the new file.
- - Run the regression suite again. There should be no new failures and the new
-   file should not be among the failures.
- - Include the db.zip file with your Pull Request. Travis CI enforces a passing
-   regression suite (with offenders whitelisted as a last resort).
-
-4) I made a change/fix/patch to a loader, how to update the database?
---------------------------------------------------------------------------------
- - Rebuild the regression database using "gen_db.py <binary> -ixyz"
-   where .xyz is the file extension for which the loader was patched.
- - Run the regression suite again. There should be no new failures and the new
-   file should not be among the failures.
- - Include the db.zip file with your Pull Request. Travis CI enforces a passing
-   regression suite (with offenders whitelisted as a last resort).
-
-5) How to add my whole model repository to the database?
---------------------------------------------------------------------------------
-
-Edit the reg_settings.py file and add the path to your repository to
-<<model_directories>>. Then, rebuild the database.
-
-6) So what is actually tested?
---------------------------------------------------------------------------------
-The regression database includes mini dumps of the aiScene data structure, i.e.
-the scene hierarchy plus the sizes of all data arrays MUST match. Floating-point
-data buffers, such as vertex positions are handled less strictly: min, max and
-average values are stored with low precision. This takes hardware- or
-compiler-specific differences in floating-point computations into account.
-Generally, almost all significant regressions will be detected while the
-number of false positives is relatively low.
-
-7) The test suite fails, what do do?
---------------------------------------------------------------------------------
-Get back to <root>/test/results and look at regression_suite_failures.txt.
-It contains a list of all files which failed the test. Failing dumps are copied to
-<root>/test/results/tmp. Both an EXPECTED and an ACTUAL file is produced per test.
-The output of "assimp cmpdump" is written to regressions_suite_output.txt. Grep
-for the file name in question and locate the log for the failed comparison. It
-contains a full trace of which scene elements have been compared before, which
-makes it reasonably easy to locate the offending field.
-
-8) fp:fast vs fp:precise fails the test suite (same for gcc equivalents)
---------------------------------------------------------------------------------
-As mentioned above, floating-point inaccuracies between differently optimized
-builds are not considered regressions and all float comparisons done by the test
-suite involve an epsilon to accommodate. However compiler settings that allow
-compilers to perform non-IEEE754 compliant optimizations can cause arbitrary
-failures in the test suite. Even if the compiler is configured to be IEE754
-comformant, there is lots of code in assimp that leaves the compiler a choice
-and different compilers make different choices (for example the precision of
-float intermediaries is implementation-specified).
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--- a/test/regression/ai_regression_ui.py
+++ b/test/regression/ai_regression_ui.py
@@ -1,293 +0,0 @@
-#!/usr/bin/env python3
-# -*- Coding: UTF-8 -*-
-
-# ---------------------------------------------------------------------------
-# Open Asset Import Library (ASSIMP)
-# ---------------------------------------------------------------------------
-#
-# Copyright (c) 2006-2020, ASSIMP Development Team
-#
-# All rights reserved.
-#
-# Redistribution and use of this software in source and binary forms, 
-# with or without modification, are permitted provided that the following 
-# conditions are met:
-# 
-# * Redistributions of source code must retain the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer.
-# 
-# * Redistributions in binary form must reproduce the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer in the documentation and/or other
-#   materials provided with the distribution.
-# 
-# * Neither the name of the ASSIMP team, nor the names of its
-#   contributors may be used to endorse or promote products
-#   derived from this software without specific prior
-#   written permission of the ASSIMP Development Team.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# ---------------------------------------------------------------------------
-from tkinter import *
-import sys
-import os
-import platform
-import run
-import subprocess
-import result_checker as rc
-
-INFO  = 0
-WARN  = 1
-ERROR = 2
-
-# -------------------------------------------------------------------------------
-def log( sev, msg ):
-    """
-    This function is used to log info, warnings and errors.
-    """
-    logEntry = ""
-    if sev == 0:
-        logEntry = logEntry + "[INFO]: "
-    elif sev == 1:
-        logEntry = logEntry + "[WARN]: "
-    elif sev == 2:
-        logEntry = logEntry + "[ERR] : "
-    logEntry = logEntry + str( msg )
-    print( logEntry )
-
-# -------------------------------------------------------------------------------
-class BaseDialog( Toplevel ):
-    """
-    Helper base class for dialogs used in the UI.
-    """
-
-    def __init__(self, parent, title = None, buttons=""):
-        """
-        Constructor
-        """
-        Toplevel.__init__( self, parent )
-        self.transient(parent)
-
-        if title:
-            self.title(title)
-
-        self.parent = parent
-        self.result = None
-        body = Frame(self)
-        self.initial_focus = self.body(body)
-        body.pack(padx=5, pady=5)
-        self.buttonbox(buttons)
-        self.grab_set()
-        if not self.initial_focus:
-            self.initial_focus = self
-        self.protocol("WM_DELETE_WINDOW", self.cancel)
-        self.geometry("+%d+%d" % (parent.winfo_rootx() + 50,
-                                  parent.winfo_rooty() + 50))
-        self.initial_focus.focus_set()
-        self.wait_window(self)
-
-    def body(self, master):
-        # create dialog body.  return widget that should have
-        # initial focus.  this method should be overridden
-        pass
-
-    def buttonbox(self, buttons):
-        # add standard button box. override if you don't want the
-        # standard buttons
-        box = Frame(self)
-        w = Button(box, text="OK", width=40, command=self.ok, default=ACTIVE)
-        w.pack(side=LEFT, padx=5, pady=5)
-        self.bind("<Return>", self.ok)
-        box.pack()
-
-    def ok(self, event=None):
-        if not self.validate():
-            self.initial_focus.focus_set()  # put focus back
-            return
-
-        self.withdraw()
-        self.update_idletasks()
-        self.apply()
-        self.cancel()
-
-    def cancel(self, event=None):
-        # put focus back to the parent window
-        self.parent.focus_set()
-        self.destroy()
-
-    def validate(self):
-        return 1  # override
-
-    def apply(self):
-        pass  # override
-
-# -------------------------------------------------------------------------------
-class VersionDialog( BaseDialog ):
-    """
-    This class is used to create the info dialog.
-    """
-    def body(self, master):
-        # info will be read from assimp command line tool
-        version = "Asset importer lib version unknown"
-        exe = run.getEnvVar( "assimp_path" )
-        if len( exe ) != 0:
-            command = [exe, "version" ]
-            log( INFO, "command = " + str(command))
-            stdout = subprocess.check_output(command)
-            for line in stdout.splitlines():
-                pos = str(line).find( "Version" )
-                if -1 != pos:
-                    version = line
-        Label(master, text=version).pack()
-
-    def apply(self):
-        pass
-
-# -------------------------------------------------------------------------------
-class SetupDialog( BaseDialog ):
-    """
-    This class is used to create the setup dialog.
-    """
-    def body(self, master):
-        Label(master, justify=LEFT, text="Assimp: " ).grid(row=0, column=0)
-        Label(master, justify=LEFT, text=run.getEnvVar("assimp_path")).grid(row=0, column=1)
-        Label(master, text="New executable:").grid(row=1)
-        self.e1 = Entry(master)
-        self.e1.grid(row=1, column=1)
-        return self.e1  # initial focus
-
-    def apply(self):
-        exe = str( self.e1.get() )
-        if len( exe )  == 0:
-            return 0
-        if os.path.isfile( exe ):
-            log( INFO, "Set executable at " + exe)
-            self.assimp_bin_path = exe
-            run.setEnvVar("assimp_path", self.assimp_bin_path)
-        else:
-            log( ERROR, "Executable not found at "+exe )
-        return 0
-
-# -------------------------------------------------------------------------------
-class RegDialog( object ):
-    """
-    This class is used to create a simplified user interface for running the regression test suite.
-    """
-    
-    def __init__(self, bin_path ):
-        """
-        Constructs the dialog, you can define which executable shal be used.
-        @param  bin_path    [in] Path to assimp binary.
-        """
-        run.setEnvVar( "assimp_path", bin_path )
-        self.b_run_ = None
-        self.b_update_ = None
-        self.b_res_checker_ = None
-        self.b_quit_ = None
-        if platform.system() == "Windows":
-            self.editor = "notepad"
-        elif platform.system() == "Linux":
-            self.editor = "vim"
-        self.root = None
-        self.width=40
-        
-    def run_reg(self):
-        log(INFO, "Starting regression test suite.")
-        run.run_test()
-        rc.run()
-        self.b_update_.config( state=ACTIVE  )
-        return 0
-
-    def reg_update(self):
-        assimp_exe = run.getEnvVar( "assimp_path" )
-        if len( assimp_exe ) == 0:
-            return 1
-        exe = "python"
-        command = [ exe, "gen_db.py", assimp_exe ]
-        log(INFO, "command = " + str(command))
-        stdout = subprocess.call(command)
-
-        log(INFO, stdout)
-        return 0
-    
-    def shop_diff( self ):
-        log(WARN, "ToDo!")
-        return 0
-        
-    def open_log(self):
-        command = [ self.editor, "../results/run_regression_suite_output.txt", ]
-        log(INFO, "command = " + str( command ) )
-        r = subprocess.call(command)
-        return 0
-
-    def show_version( self ):
-        d = VersionDialog( self.root )
-        return 0
-    
-    def setup(self):
-        d = SetupDialog( self.root )
-        return 0
-
-    def quit(self):
-        log( INFO, "quit" )
-        sys.exit( 0 )
-
-    def initUi(self):
-        # create the frame with buttons
-        self.root = Tk()
-        self.root.title( "Assimp-Regression UI")
-        self.b_run_       = Button( self.root, text="Run regression ", command=self.run_reg,    width = self.width )
-        self.b_update_    = Button( self.root, text="Update database", command=self.reg_update, width = self.width )
-        self.b_show_diff_ = Button( self.root, text="Show diff", command=self.shop_diff, width = self.width )
-        self.b_log_       = Button( self.root, text="Open log", command=self.open_log, width = self.width )
-        self.b_setup_     = Button( self.root, text="Setup", command=self.setup, width = self.width )
-        self.b_version_   = Button( self.root, text="Show version", command=self.show_version, width = self.width )
-        self.b_quit_      = Button( self.root, text="Quit", command=self.quit,       width = self.width )
-        
-        # define the used grid
-        self.b_run_.grid(       row=0, column=0, sticky=W+E )
-        self.b_update_.grid(    row=1, column=0, sticky=W+E )
-        self.b_show_diff_.grid( row=2, column=0, sticky=W+E )
-        self.b_log_.grid(       row=3, column=0, sticky=W+E )
-        self.b_setup_.grid(     row=4, column=0, sticky=W+E )
-        self.b_version_.grid(   row=5, column=0, sticky=W+E )
-        self.b_quit_.grid(      row=6, column=0, sticky=W+E )
-        
-        #self.b_update_.config( state=DISABLED )
-        self.b_show_diff_.config( state=DISABLED )
-        
-        # run mainloop
-        self.root.mainloop()
-
-# -------------------------------------------------------------------------------
-def getDefaultExecutable():
-    assimp_bin_path = ""
-    if platform.system() == "Windows":
-        assimp_bin_path = '..\\..\\bin\\debug\\assimpd.exe'
-    elif platform.system() == "Linux":
-        assimp_bin_path = '../../bin/assimp'
-
-    return assimp_bin_path
-
-# -------------------------------------------------------------------------------
-if __name__ == "__main__":
-    if len(sys.argv) > 1:
-        assimp_bin_path = sys.argv[1]
-    else:
-        assimp_bin_path = getDefaultExecutable()
-    log( INFO, 'Using assimp binary: ' + assimp_bin_path )
-    dlg = RegDialog(assimp_bin_path)
-    dlg.initUi()
-   
-# vim: ai ts=4 sts=4 et sw=4
--- a/test/regression/gen_db.py
+++ b/test/regression/gen_db.py
@@ -1,225 +0,0 @@
-#!/usr/bin/env python3
-# -*- Coding: UTF-8 -*-
-
-# ---------------------------------------------------------------------------
-# Open Asset Import Library (ASSIMP)
-# ---------------------------------------------------------------------------
-#
-# Copyright (c) 2006-2020, ASSIMP Development Team
-#
-# All rights reserved.
-#
-# Redistribution and use of this software in source and binary forms, 
-# with or without modification, are permitted provided that the following 
-# conditions are met:
-# 
-# * Redistributions of source code must retain the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer.
-# 
-# * Redistributions in binary form must reproduce the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer in the documentation and/or other
-#   materials provided with the distribution.
-# 
-# * Neither the name of the ASSIMP team, nor the names of its
-#   contributors may be used to endorse or promote products
-#   derived from this software without specific prior
-#   written permission of the ASSIMP Development Team.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# ---------------------------------------------------------------------------
-
-"""
-Generate the regression database db.zip from the files in the <root>/test/models
-directory. Older databases are overwritten with no prompt but can be restored
-using Git as needed.
-
-Use --help for usage.
-
-On Windows, use ``py run.py <arguments>`` to make sure command line parameters
-are forwarded to the script.
-"""
-
-import sys
-import os
-import subprocess
-import zipfile
-
-import settings
-import utils
-
-usage = """gen_db [assimp_binary] [-i=...] [-e=...] [-p] [-n]
-
-The assimp_cmd (or assimp) binary to use is specified by the first
-command line argument and defaults to ``assimp``.
-
-To build, set ``ASSIMP_BUILD_ASSIMP_TOOLS=ON`` in CMake. If generating
-configs for an IDE, make sure to build the assimp_cmd project.
-
-i,--include: List of file extensions to update dumps for. If omitted,
-         all file extensions are updated except those in `exclude`.
-         Example: -ixyz,abc
-                  -i.xyz,.abc
-                  --include=xyz,abc
-
-e,--exclude: Merged with settings.exclude_extensions to produce a
-         list of all file extensions to ignore. If dumps exist,
-         they are not altered. If not, theu are not created.
-
-p,--preview: Preview list of file extensions touched by the update.
-         Dont' change anything.
-
-n,--nozip: Don't pack to ZIP archive. Keep all dumps in individual files.
-"""
-
-# -------------------------------------------------------------------------------
-def process_dir(d, outfile, file_filter):
-    """ Generate small dump records for all files in 'd' """
-    print("Processing directory " + d)
-
-    num = 0
-    for f in os.listdir(d):
-        fullp = os.path.join(d, f)
-        if os.path.isdir(fullp) and not f == ".svn":
-            num += process_dir(fullp, outfile, file_filter)
-            continue
-
-        if file_filter(f):
-            for pp in settings.pp_configs_to_test:
-                num += 1
-                print("DUMP " + fullp + "\n post-processing: " + pp)
-                outf = os.path.join(os.getcwd(), settings.database_name,
-                    utils.hashing(fullp, pp))
-
-                cmd = [ assimp_bin_path, "dump", fullp, outf, "-b", "-s", "-l" ] + pp.split()
-                outfile.write("assimp dump "+"-"*80+"\n")
-                outfile.flush()
-                if subprocess.call(cmd, stdout=outfile, stderr=outfile, shell=False):
-                    print("Failure processing " + fullp)
-
-                    # spit out an empty file to indicate that this failure is expected
-                    with open(outf,'wb') as f:
-                        pass
-    return num
-                    
-
-# -------------------------------------------------------------------------------
-def make_zip():
-    """Zip the contents of ./<settings.database_name>
-    to <settings.database_name>.zip using DEFLATE
-    compression to minimize the file size. """
-
-    num = 0
-    zipout = zipfile.ZipFile(settings.database_name + ".zip", "w", zipfile.ZIP_DEFLATED)
-    for f in os.listdir(settings.database_name):
-        p = os.path.join(settings.database_name, f)
-        zipout.write(p, f)
-        if settings.remove_old:
-            os.remove(p)
-
-        num += 1
-
-    if settings.remove_old:
-        os.rmdir(settings.database_name)
-
-    bad = zipout.testzip()
-    assert bad is None
-
-    print("="*60)
-    print("Database contains {0} entries".format(num))
-
-
-# -------------------------------------------------------------------------------
-def extract_zip():
-    """Unzip <settings.database_name>.zip to
-    ./<settings.database_name>"""
-    try:
-        zipout = zipfile.ZipFile(settings.database_name + ".zip", "r", 0)
-        zipout.extractall(path=settings.database_name)
-    except (RuntimeError,IOError) as r:
-        print(r)
-        print("failed to extract previous ZIP contents. "\
-              "DB is generated from scratch.")
-        
-
-# -------------------------------------------------------------------------------
-def gen_db(ext_list,outfile):
-    """Generate the crash dump database in
-    ./<settings.database_name>"""
-    try:
-        os.mkdir(settings.database_name)
-    except OSError:
-        pass
-
-    num = 0
-    for tp in settings.model_directories:
-        num += process_dir(tp, outfile,
-            lambda x: os.path.splitext(x)[1].lower() in ext_list and not x in settings.files_to_ignore)
-
-    print("="*60)
-    print("Updated {0} entries".format(num))
-        
-
-# -------------------------------------------------------------------------------
-if __name__ == "__main__":
-    def clean(f):
-        f = f.strip("* \'")
-        return "."+f if f[:1] != '.' else f
-
-    if len(sys.argv) <= 1 or sys.argv[1] == "--help" or sys.argv[1] == "-h":
-        print(usage)
-        sys.exit(0)
-
-    assimp_bin_path = sys.argv[1]    
-    ext_list, preview, nozip = None, False, False
-    for m in sys.argv[2:]:
-        if m[:10]=="--exclude=":
-            settings.exclude_extensions += map(clean, m[10:].split(","))
-        elif m[:2]=="-e":
-            settings.exclude_extensions += map(clean, m[2:].split(","))
-        elif m[:10]=="--include=":
-            ext_list = m[10:].split(",")
-        elif m[:2]=="-i":
-            ext_list = m[2:].split(",")
-        elif m=="-p" or m == "--preview":
-            preview = True
-        elif m=="-n" or m == "--nozip":
-            nozip = True
-        else:
-            print("Unrecognized parameter: " + m)
-            sys.exit(-1)
-            
-    outfile = open(os.path.join("..", "results", "gen_regression_db_output.txt"), "w")
-    if ext_list is None:
-        (ext_list, err) = subprocess.Popen([assimp_bin_path, "listext"],
-            stdout=subprocess.PIPE).communicate()
-        ext_list = str(ext_list.strip()).lower().split(";")
-
-    # todo: Fix for multi dot extensions like .skeleton.xml
-    ext_list = list(filter(lambda f: not f in settings.exclude_extensions,
-        map(clean, ext_list)))
-    print('File extensions processed: ' + ', '.join(ext_list))
-    if preview:       
-        sys.exit(1)
-
-    extract_zip()    
-    gen_db(ext_list,outfile)
-    make_zip()
-
-    print("="*60)
-    input("Press any key to continue")
-    sys.exit(0)
-    
-# vim: ai ts=4 sts=4 et sw=4    
-
--- a/test/regression/result_checker.py
+++ b/test/regression/result_checker.py
@@ -1,113 +0,0 @@
-#!/usr/bin/env python3
-# -*- Coding: UTF-8 -*-
-
-# ---------------------------------------------------------------------------
-# Open Asset Import Library (ASSIMP)
-# ---------------------------------------------------------------------------
-#
-# Copyright (c) 2006-2020, ASSIMP Development Team
-#
-# All rights reserved.
-#
-# Redistribution and use of this software in source and binary forms, 
-# with or without modification, are permitted provided that the following 
-# conditions are met:
-# 
-# * Redistributions of source code must retain the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer.
-# 
-# * Redistributions in binary form must reproduce the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer in the documentation and/or other
-#   materials provided with the distribution.
-# 
-# * Neither the name of the ASSIMP team, nor the names of its
-#   contributors may be used to endorse or promote products
-#   derived from this software without specific prior
-#   written permission of the ASSIMP Development Team.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# ---------------------------------------------------------------------------
-
-"""
-This script runs as part of the Travis CI build on Github and controls
-whether a patch passes the regression test suite.
-
-Given the failures encountered by the regression suite runner (run.py) in
-  ../results/whitelist.csv
-and the current whitelist of failures considered acceptable in
-  ./run_regression_suite_failures_whitelisted.csv
-determine PASSED or FAILED.
-
-"""
-
-import sys
-import os
-
-RESULTS_FILE = os.path.join('..', 'results', 'run_regression_suite_failures.csv')
-WHITELIST_FILE = os.path.join('whitelist.csv')
-
-BANNER = """
-*****************************************************************
-Regression suite result checker
-(test/regression/result_checker.py)
-*****************************************************************
-"""
-
-def passed(message):
-    print('\n\n**PASSED: {0}.\n'.format(message))
-    return 0
-
-def failed(message):
-    print('\n\n**FAILED: {0}. \nFor more information see test/regression/README.\n'
-        .format(message))
-    return -1
-
-def read_results_csv(filename):
-    parse = lambda line: map(str.strip, line.split(';')[:2])
-    try:
-        with open(filename, 'rt') as results:
-            return dict(parse(line) for line in results.readlines()[1:])
-    except IOError:
-        print('Failed to read {0}.'.format(filename))
-        return None
-
-def run():
-    print(BANNER)
-    print('Reading input files.')
-    
-    result_dict = read_results_csv(RESULTS_FILE)
-    whitelist_dict = read_results_csv(WHITELIST_FILE)
-    if result_dict is None or whitelist_dict is None:
-        return failed('Could not locate input files')
-
-    if not result_dict:
-        return passed('No failures encountered')
-
-    print('Failures:\n' + '\n'.join(sorted(result_dict.keys())))
-    print('Whitelisted:\n' + '\n'.join(sorted(whitelist_dict.keys())))
-    non_whitelisted_failures = set(result_dict.keys()) - set(whitelist_dict.keys())
-    print('Failures not whitelisted:\n' + '\n'.join(sorted(non_whitelisted_failures)))
-    if not non_whitelisted_failures:
-        return passed('All failures are whitelisted and considered acceptable \n' +
-            'due to implementation differences, library shortcomings and bugs \n' +
-            'that have not been fixed for a long time')
-    return failed('Encountered new regression failures that are not whitelisted.  \n' +
-        'Please carefully review the changes you made and use the gen_db.py script\n' +
-        'to update the regression database for the affected files')
-
-if __name__ == "__main__":
-    sys.exit(run())
-
-# vim: ai ts=4 sts=4 et sw=4
--- a/test/regression/run.py
+++ b/test/regression/run.py
@@ -1,320 +0,0 @@
-#!/usr/bin/env python3
-# -*- Coding: UTF-8 -*-
-
-# ---------------------------------------------------------------------------
-# Open Asset Import Library (ASSIMP)
-# ---------------------------------------------------------------------------
-#
-# Copyright (c) 2006-2020, ASSIMP Development Team
-#
-# All rights reserved.
-#
-# Redistribution and use of this software in source and binary forms,
-# with or without modification, are permitted provided that the following
-# conditions are met:
-#
-# * Redistributions of source code must retain the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer in the documentation and/or other
-#   materials provided with the distribution.
-#
-# * Neither the name of the ASSIMP team, nor the names of its
-#   contributors may be used to endorse or promote products
-#   derived from this software without specific prior
-#   written permission of the ASSIMP Development Team.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# ---------------------------------------------------------------------------
-
-"""
-Run the regression test suite using settings from settings.py.
-
-The assimp_cmd (or assimp) binary to use is specified by the first
-command line argument and defaults to ``assimp``.
-
-To build, set ``ASSIMP_BUILD_ASSIMP_TOOLS=ON`` in CMake. If generating
-configs for an IDE, make sure to build the assimp_cmd project.
-
-On Windows, use ``py run.py <path to assimp>`` to make sure the command
-line parameter is forwarded to the script.
-"""
-
-import sys
-import os
-import subprocess
-import zipfile
-import collections
-import multiprocessing
-
-import settings
-import utils
-
-# -------------------------------------------------------------------------------
-EXPECTED_FAILURE_NOT_MET, DATABASE_LENGTH_MISMATCH, \
-DATABASE_VALUE_MISMATCH, IMPORT_FAILURE, \
-FILE_NOT_READABLE, COMPARE_SUCCESS, EXPECTED_FAILURE = range(7)
-
-messages = collections.defaultdict(lambda: "<unknown", {
-        EXPECTED_FAILURE_NOT_MET:
-"""Unexpected success during import\n\
-\tReturn code was 0""",
-
-        DATABASE_LENGTH_MISMATCH:
-"""Database mismatch: lengths don't match\n\
-\tExpected: {0} Actual: {1}""",
-
-        DATABASE_VALUE_MISMATCH:
-"""Database mismatch: """,
-
-        IMPORT_FAILURE:
-"""Unexpected failure during import\n\
-\tReturn code was {0}""",
-
-        FILE_NOT_READABLE:
-"""Unexpected failure reading file""",
-
-        COMPARE_SUCCESS:
-"""Results match archived reference dump in database\n\
-\tNumber of bytes compared: {0}""",
-
-        EXPECTED_FAILURE:
-"""Expected failure was met.""",
-})
-
-outfilename_output = "run_regression_suite_output.txt"
-outfilename_failur = "run_regression_suite_failures.csv"
-Environment        = {}
-
-# -------------------------------------------------------------------------------
-class results:
-
-    """ Handle formatting of results"""
-
-    def __init__(self, zipin):
-        """Init, given a ZIPed database """
-        self.failures = []
-        self.success = []
-        self.zipin = zipin
-
-
-    def fail(self, failfile, filename_expect, pp, msg, *args):
-        """
-        Report failure of a sub-test
-
-        File f failed a test for pp config pp, failure notice is msg,
-        *args is format()ting args for msg
-
-        """
-        print("[FAILURE] " + messages[msg].format(*args))
-        self.failures.append((failfile, filename_expect, pp))
-
-
-    def ok(self, f, pp, msg, *args):
-        """
-        Report success of a sub-test
-
-        File f passed the test, msg is a happy success note,
-        *args is format()ing args for msg.
-
-        """
-        print("[SUCCESS] " + messages[msg].format(*args))
-        self.success.append(f)
-
-
-    def report_results(self):
-        """Write results to ../results/run_regression_suite_failures.txt"""
-
-        count_success = len(self.success)
-        count_fail = len(self.failures)
-        percent_good = float(count_success) / (count_success + count_fail)
-        print("\n" + ('='*60) + "\n" + "SUCCESS: {0}\nFAILURE: {1}\nPercentage good: {2}".format(
-            count_success, count_fail, percent_good) +
-              "\n" + ('='*60) + "\n")
-
-        with open(os.path.join('..', 'results',outfilename_failur), "wt") as f:
-            f.write("ORIGINAL FILE;EXPECTED DUMP\n")
-            f.writelines(map(
-                lambda x: x[0] + ' ' + x[2] + ";" + x[1] + "\n", self.failures))
-
-        if self.failures:
-           print("\nSee " + settings.results + "\\" + outfilename_failur
-                 + " for more details\n\n")
-
-    def hasFailures( self ):
-        """ Return True, if any failures there. """
-        return 0 != len( self.failures )
-
-# -------------------------------------------------------------------------------
-def setEnvVar( var, value ):
-    print ( "set var " + var +" to" + value)
-    Environment[ var ] = value
-
-# -------------------------------------------------------------------------------
-def getEnvVar( var ):
-    if var in Environment:
-        return Environment[ var ]
-    else:
-        print ( "Error: cannot find " + var )
-    return ""
-    
-# -------------------------------------------------------------------------------
-def prepare_output_dir(fullpath, myhash, app):
-    outfile = os.path.join(settings.results, "tmp", os.path.split(fullpath)[1] + "_" + myhash)
-    try:
-        os.mkdir(outfile)
-    except OSError:
-        pass
-
-    outfile = os.path.join(outfile, app)
-    return outfile
-
-# -------------------------------------------------------------------------------
-def process_dir(d, outfile_results, zipin, result ):
-    shellparams = {'stdout':outfile_results, 'stderr':outfile_results, 'shell':False}
-
-    print("Processing directory " + d)
-    all = ""
-    for f in sorted(os.listdir(d)):
-        fullpath = os.path.join(d, f)
-        if os.path.isdir(fullpath) and not f[:1] == '.':
-            process_dir(fullpath, outfile_results, zipin, result)
-            continue
-                
-        if f in settings.files_to_ignore or os.path.splitext(f)[1] in settings.exclude_extensions:
-            print("Ignoring " + f)
-            return
-
-        for pppreset in settings.pp_configs_to_test:
-            filehash = utils.hashing(fullpath, pppreset)
-            failure = False
-
-            try:
-                input_expected = zipin.open(filehash, "r").read()
-                # empty dump files indicate 'expected import failure'
-                if not len(input_expected):
-                   failure = True
-            except KeyError:
-                # TODO(acgessler): Keep track of this and report as error in the end.
-                print("Didn't find "+fullpath+" (Hash is "+filehash+") in database. Outdated "+\
-                    "regression database? Use gen_db.zip to re-generate.")
-                continue
-
-            print("-"*60 + "\n  " + os.path.realpath(fullpath) + " pp: " + pppreset)
-
-            outfile_actual = prepare_output_dir(fullpath, filehash, "ACTUAL")
-            outfile_expect = prepare_output_dir(fullpath, filehash, "EXPECT")
-            outfile_results.write("assimp dump    "+"-"*80+"\n")
-            outfile_results.flush()
-            assimp_bin_path = getEnvVar("assimp_path")
-            command = [assimp_bin_path,
-                "dump",
-                fullpath, outfile_actual, "-b", "-s", "-l" ] +\
-                pppreset.split()
-            print( "command = " + str( command ) )
-            r = subprocess.call(command, **shellparams)
-            outfile_results.flush()
-
-            if r and not failure:
-                result.fail(fullpath, outfile_expect, pppreset, IMPORT_FAILURE, r)
-                outfile_results.write("Failed to import\n")
-                continue
-            elif failure and not r:
-                result.fail(fullpath, outfile_expect, pppreset, EXPECTED_FAILURE_NOT_MET)
-                outfile_results.write("Expected import to fail\n")
-                continue
-            elif failure and r:
-                result.ok(fullpath, pppreset, EXPECTED_FAILURE)
-                outfile_results.write("Failed as expected, skipping.\n")
-                continue
-
-            with open(outfile_expect, "wb") as s:
-                s.write(input_expected)
-
-            try:
-                with open(outfile_actual, "rb") as s:
-                    input_actual = s.read()
-            except IOError:
-                continue
-
-            outfile_results.write("Expected data length: {0}\n".format(len(input_expected)))
-            outfile_results.write("Actual data length: {0}\n".format(len(input_actual)))
-            failed = False
-            if len(input_expected) != len(input_actual):
-                result.fail(fullpath, outfile_expect, pppreset, DATABASE_LENGTH_MISMATCH,
-                        len(input_expected), len(input_actual))
-                # Still compare the dumps to see what the difference is
-                failed = True
-
-            outfile_results.write("assimp cmpdump "+"-"*80+"\n")
-            outfile_results.flush()
-            command = [ assimp_bin_path, 'cmpdump', outfile_actual, outfile_expect ]
-            if subprocess.call(command, **shellparams) != 0:
-                if not failed:
-                    result.fail(fullpath, outfile_expect, pppreset, DATABASE_VALUE_MISMATCH)
-                continue
-
-            result.ok(fullpath, pppreset, COMPARE_SUCCESS, len(input_expected))
-
-# -------------------------------------------------------------------------------
-def del_folder_with_contents(folder):
-    for root, dirs, files in os.walk(folder, topdown=False):
-        for name in files:
-            os.remove(os.path.join(root, name))
-        for name in dirs:
-            os.rmdir(os.path.join(root, name))
-
-
-# -------------------------------------------------------------------------------
-def run_test():
-    tmp_target_path = os.path.join(settings.results, "tmp")
-    try:
-        print( "try to make " + tmp_target_path )
-        os.mkdir(tmp_target_path)
-    except OSError as oerr:
-        # clear contents if tmp folder exists already
-       del_folder_with_contents(tmp_target_path)
-
-    try:
-        zipin = zipfile.ZipFile(settings.database_name + ".zip",
-            "r", zipfile.ZIP_STORED)
-    except IOError:
-        print("Regression database ", settings.database_name,
-              ".zip was not found")
-        return
-
-    res = results(zipin)
-    with open(os.path.join(settings.results, outfilename_output), "wt") as outfile:
-        for tp in settings.model_directories:
-            process_dir(tp, outfile, zipin, res)
-
-    res.report_results()
-    if res.hasFailures():
-        return 1
-
-    return 0
-
-# -------------------------------------------------------------------------------
-if __name__ == "__main__":
-    if len(sys.argv) > 1:
-        assimp_bin_path = sys.argv[1]
-    else:
-        assimp_bin_path = 'assimp'
-    setEnvVar("assimp_path", assimp_bin_path)
-    print('Using assimp binary: ' + assimp_bin_path)
-    sys.exit( run_test() )
-
-# vim: ai ts=4 sts=4 et sw=4
--- a/test/regression/settings.py
+++ b/test/regression/settings.py
@@ -1,134 +0,0 @@
-#!/usr/bin/env python3
-# -*- Coding: UTF-8 -*-
-
-# ---------------------------------------------------------------------------
-# Open Asset Import Library (ASSIMP)
-# ---------------------------------------------------------------------------
-#
-# Copyright (c) 2006-2020, ASSIMP Development Team
-#
-# All rights reserved.
-#
-# Redistribution and use of this software in source and binary forms, 
-# with or without modification, are permitted provided that the following 
-# conditions are met:
-# 
-# * Redistributions of source code must retain the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer.
-# 
-# * Redistributions in binary form must reproduce the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer in the documentation and/or other
-#   materials provided with the distribution.
-# 
-# * Neither the name of the ASSIMP team, nor the names of its
-#   contributors may be used to endorse or promote products
-#   derived from this software without specific prior
-#   written permission of the ASSIMP Development Team.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# ---------------------------------------------------------------------------
-
-"""Shared settings for the regression suite (bold builder and
-test scripts rely on this)
-
-"""
-
-import os
-
-# -------------------------------------------------------------------------------
-# Files to ignore (with reason)
-#
-# pond.0.ply - loads with 40k identical triangles, causing postprocessing
-# to have quadratic runtime.
-# -------------------------------------------------------------------------------
-files_to_ignore = ["pond.0.ply"]
-
-# -------------------------------------------------------------------------------
-# List of file extensions to be excluded from the regression suite
-# File extensions are case insensitive
-# -------------------------------------------------------------------------------
-exclude_extensions = [
-    ".assbin", ".assxml", ".txt", ".md",
-    ".jpeg", ".jpg", ".png", ".gif", ".tga", ".bmp",
-    ".skeleton", ".skeleton.xml", ".license", ".mtl", ".material", ".pk3"
-]
-
-# -------------------------------------------------------------------------------
-# Post processing configurations to be included in the test. The
-# strings are parameters for assimp_cmd, see assimp_cmd's doxydoc
-# for more details. 
-
-# The defaults are (validate-data-structure is always enabled, for
-# self-explanatory reasons :-):
-#
-# '-cfull'    :apply all post processing except 'og' and 'ptv' (optimize-scenegraph)
-# '-og -om'   :run optimize-scenegraph in combination with optimize-meshes.
-# '-vds -jiv' :join-identical-vertices alone. This is a hotspot where
-#              floating-point inaccuracies can cause severe damage.
-# '-ptv':      transform all meshes to world-space
-
-# As you can see, not all possible combinations of pp steps are covered - 
-# but at least each step is executed at least once on each model. 
-# -------------------------------------------------------------------------------
-pp_configs_to_test = [
-    "-cfull",
-    "-og -om -vds",
-    "-vds -jiv",
-    "-ptv -gsn -cts -db",
-
-    # this is especially important: if no failures are present with this 
-    # preset, the regression is most likely caused by the post
-    # processing pipeline.
-    ""
-]
-# -------------------------------------------------------------------------------
-# Name of the regression database file to be used
-# gen_db.py writes to this directory, run.py checks against this directory.
-# If a zip file with the same name exists, its contents are favoured to a 
-# normal directory, so in order to test against unzipped files the ZIP needs
-# to be deleted.
-# -------------------------------------------------------------------------------
-database_name = "db"
-
-# -------------------------------------------------------------------------------
-# List of directories to be processed. Paths are processed recursively.
-# -------------------------------------------------------------------------------
-model_directories = [
-    os.path.join("..","models"),
-    os.path.join("..","models-nonbsd")
-]
-
-# -------------------------------------------------------------------------------
-# Remove the original database files after the ZIP has been built?
-# -------------------------------------------------------------------------------
-remove_old = True
-
-# -------------------------------------------------------------------------------
-# Bytes to skip at the beginning of a dump. This skips the file header, which
-# is currently the same 500 bytes header for both assbin, assxml and minidumps.
-# -------------------------------------------------------------------------------
-dump_header_skip = 500
-
-# -------------------------------------------------------------------------------
-# Directory to write all results and logs to. The dumps pertaining to failed
-# tests are written to a subfolder of this directory ('tmp').
-# -------------------------------------------------------------------------------
-results = os.path.join("..","results")
-
-# Create results directory if it does not exist
-if not os.path.exists(results):
-    os.makedirs(results)
-
-# vim: ai ts=4 sts=4 et sw=4
--- a/test/regression/utils.py
+++ b/test/regression/utils.py
@@ -1,62 +0,0 @@
-#!/usr/bin/env python3
-# -*- Coding: UTF-8 -*-
-
-# ---------------------------------------------------------------------------
-# Open Asset Import Library (ASSIMP)
-# ---------------------------------------------------------------------------
-#
-# Copyright (c) 2006-2020, ASSIMP Development Team
-#
-# All rights reserved.
-#
-# Redistribution and use of this software in source and binary forms, 
-# with or without modification, are permitted provided that the following 
-# conditions are met:
-# 
-# * Redistributions of source code must retain the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer.
-# 
-# * Redistributions in binary form must reproduce the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer in the documentation and/or other
-#   materials provided with the distribution.
-# 
-# * Neither the name of the ASSIMP team, nor the names of its
-#   contributors may be used to endorse or promote products
-#   derived from this software without specific prior
-#   written permission of the ASSIMP Development Team.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# ---------------------------------------------------------------------------
-
-"""Shared stuff for the gen_db and run scripts"""
-
-# -------------------------------------------------------------------------------
-def hashing(file,pp):
-    """ Map an input file and a postprocessing config to an unique hash.
-
-    The hash is used to store the item in the database. It 
-    needs to be persistent across different python implementations
-    and platforms, so we implement the hashing manually.
-    """
-    file = file.lower()
-    file = file.replace('\\','/')+":"+pp
-    # SDBM hash
-    res = 0
-    for t in file:
-        res = (ord(t) + (res<<6) + (res<<16) - res) % 2**32
-    return '{:x}'.format(res)
-
-
- # vim: ai ts=4 sts=4 et sw=4
--- a/test/regression/whitelist.csv
+++ b/test/regression/whitelist.csv
@@ -1,32 +0,0 @@
-ORIGINAL FILE;EXPECTED DUMP
-../models/AC/SphereWithLightUvScaling4X.ac -cfull;../results/tmp/SphereWithLightUvScaling4X.ac_30edbbcd/EXPECT
-../models/AC/SphereWithLightUvScaling4X.ac -vds -jiv;../results/tmp/SphereWithLightUvScaling4X.ac_a627320a/EXPECT
-../models/AC/sample_subdiv.ac -cfull;../results/tmp/sample_subdiv.ac_669c529e/EXPECT
-../models/AC/sample_subdiv.ac -vds -jiv;../results/tmp/sample_subdiv.ac_d5987f9/EXPECT
-../models/BLEND/CubeHierarchy_248.blend -cfull;../results/tmp/CubeHierarchy_248.blend_4e04cc99/EXPECT
-../models/BLEND/CubeHierarchy_248.blend -og -om -vds;../results/tmp/CubeHierarchy_248.blend_5e78ea9c/EXPECT
-../models/BLEND/CubeHierarchy_248.blend -vds -jiv;../results/tmp/CubeHierarchy_248.blend_8aca7a3e/EXPECT
-../models/BLEND/CubeHierarchy_248.blend -ptv -gsn -cts -db;../results/tmp/CubeHierarchy_248.blend_1f2b8aa4/EXPECT
-../models/BLEND/CubeHierarchy_248.blend ;../results/tmp/CubeHierarchy_248.blend_b827f814/EXPECT
-../models/BLEND/SuzanneSubdiv_252.blend -cfull;../results/tmp/SuzanneSubdiv_252.blend_4a8dd3d3/EXPECT
-../models/BLEND/SuzanneSubdiv_252.blend -vds -jiv;../results/tmp/SuzanneSubdiv_252.blend_7f41fe84/EXPECT
-../models/STL/Spider_ascii.stl -cfull;../results/tmp/Spider_ascii.stl_8047fd91/EXPECT
-../models/STL/Spider_ascii.stl -vds -jiv;../results/tmp/Spider_ascii.stl_d4858346/EXPECT
-../models/STL/Spider_binary.stl -cfull;../results/tmp/Spider_binary.stl_dd4fe21/EXPECT
-../models/STL/Spider_binary.stl -vds -jiv;../results/tmp/Spider_binary.stl_2c8deeb6/EXPECT
-../models-nonbsd/BLEND/Bob.blend -cfull;../results/tmp/Bob.blend_7f8349ba/EXPECT
-../models-nonbsd/BLEND/Bob.blend -og -om -vds;../results/tmp/Bob.blend_4f4a63d/EXPECT
-../models-nonbsd/BLEND/Bob.blend -vds -jiv;../results/tmp/Bob.blend_ab1aa5dd/EXPECT
-../models-nonbsd/BLEND/Bob.blend -ptv -gsn -cts -db;../results/tmp/Bob.blend_6a5ec4c5/EXPECT
-../models-nonbsd/BLEND/Bob.blend ;../results/tmp/Bob.blend_2fc376b5/EXPECT
-../models-nonbsd/BLEND/fleurOptonl.blend -cfull;../results/tmp/fleurOptonl.blend_6e87e039/EXPECT
-../models-nonbsd/BLEND/fleurOptonl.blend -og -om -vds;../results/tmp/fleurOptonl.blend_95048e3c/EXPECT
-../models-nonbsd/BLEND/fleurOptonl.blend -vds -jiv;../results/tmp/fleurOptonl.blend_52481e9e/EXPECT
-../models-nonbsd/BLEND/fleurOptonl.blend -ptv -gsn -cts -db;../results/tmp/fleurOptonl.blend_5e7be44/EXPECT
-../models-nonbsd/BLEND/fleurOptonl.blend ;../results/tmp/fleurOptonl.blend_18ca7bb4/EXPECT
-../models-nonbsd/LWS/QuickDraw v.2.2_oldformat_56.lws -ptv -gsn -cts -db;../results/tmp/QuickDraw v.2.2_oldformat_56.lws_da6fa6e2/EXPECT
-../models-nonbsd/LWS/QuickDraw v.2.2_oldformat_56.lws ;../results/tmp/QuickDraw v.2.2_oldformat_56.lws_d37dcb52/EXPECT
-../models-nonbsd/Ogre/OgreSDK/ninja.mesh.xml -cfull;../results/tmp/ninja.mesh.xml_2a5e7eb6/EXPECT
-../models-nonbsd/PK3/SGDTT3.pk3 -ptv -gsn -cts -db;../results/tmp/SGDTT3.pk3_591f74f1/EXPECT
-../models-nonbsd/PK3/SGDTT3.pk3 ;../results/tmp/SGDTT3.pk3_ad4b2ce1/EXPECT
-../models-nonbsd/PK3/SGDTT3.pk3 -cfull;../results/tmp/SGDTT3.pk3_ad4b2ce1/EXPECT
--- a/test/unit/utObjImportExport.cpp
+++ b/test/unit/utObjImportExport.cpp
@@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 using namespace Assimp;

-static const float VertComponents[24 * 3] = {
+static constexpr float VertComponents[24 * 3] = {
    -0.500000, 0.500000, 0.500000,
    -0.500000, 0.500000, -0.500000,
    -0.500000, -0.500000, -0.500000,
@@ -76,7 +76,7 @@ static const float VertComponents[24 * 3] = {
    0.500000, -0.500000, 0.500000f
 };

-static const char *ObjModel =
+static constexpr char ObjModel[] =
        "o 1\n"
        "\n"
        "# Vertex list\n"
@@ -103,7 +103,7 @@ static const char *ObjModel =
        "\n"
        "# End of file\n";

-static const char *ObjModel_Issue1111 =
+static constexpr char ObjModel_Issue1111[] =
        "o 1\n"
        "\n"
        "# Vertex list\n"
@@ -408,7 +408,7 @@ TEST_F(utObjImportExport, homogeneous_coordinates_divide_by_zero_Test) {
    EXPECT_EQ(nullptr, scene);
 }

-TEST_F(utObjImportExport, 0based_array_Test) {
+TEST_F(utObjImportExport, zero_based_array_Test) {
    static const char *curObjModel =
            "v -0.500000 0.000000 0.400000\n"
            "v -0.500000 0.000000 -0.800000\n"
--- a/test/unit/utObjTools.cpp
+++ b/test/unit/utObjTools.cpp
@@ -38,22 +38,19 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ---------------------------------------------------------------------------
 */
+#ifndef ASSIMP_BUILD_NO_OBJ_IMPORTER
+
 #include "AssetLib/Obj/ObjFileParser.h"
 #include "AssetLib/Obj/ObjTools.h"
 #include "UnitTestPCH.h"

 using namespace ::Assimp;

-class utObjTools : public ::testing::Test {
-    // empty
-};
+class utObjTools : public ::testing::Test {};

 class TestObjFileParser : public ObjFileParser {
 public:
-    TestObjFileParser() :
-            ObjFileParser() {
-        // empty
-    }
+    TestObjFileParser() = default;

    ~TestObjFileParser() = default;

@@ -84,7 +81,7 @@ TEST_F(utObjTools, skipDataLine_TwoLines_Success) {
    buffer.resize(data.size());
    ::memcpy(&buffer[0], &data[0], data.size());
    test_parser.setBuffer(buffer);
-    static const size_t Size = 4096UL;
+    static constexpr size_t Size = 4096UL;
    char data_buffer[Size];

    test_parser.testCopyNextWord(data_buffer, Size);
@@ -112,3 +109,5 @@ TEST_F(utObjTools, countComponents_TwoLines_Success) {
    size_t numComps = test_parser.testGetNumComponentsInDataDefinition();
    EXPECT_EQ(3U, numComps);
 }
+
+#endif // ASSIMP_BUILD_NO_OBJ_IMPORTER
--- a/test/unit/utSIBImporter.cpp
+++ b/test/unit/utSIBImporter.cpp
@@ -52,22 +52,16 @@ using namespace ::Assimp;
 class utSIBImporter : public AbstractImportExportBase {
 public:
    virtual bool importerTest() {
-        Assimp::Importer importer;
+        Importer importer;
        const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/SIB/heffalump.sib", aiProcess_ValidateDataStructure);
        return nullptr != scene;
    }
 };

-TEST_F(utSIBImporter, createTest) {
-    bool ok(true);
-    try {
-        SIBImporter myImporter;
-    } catch (...) {
-        ok = false;
-    }
-    EXPECT_TRUE(ok);
-}
-
 TEST_F(utSIBImporter, importTest) {
+#ifdef ASSIMP_BUILD_NO_SIB_IMPORTER
+    EXPECT_FALSE(importerTest());
+#else
    EXPECT_TRUE(importerTest());
+#endif
 }
--- a/test/unit/utSMDImportExport.cpp
+++ b/test/unit/utSMDImportExport.cpp
@@ -56,18 +56,12 @@ public:
    }
 };

-TEST_F(utSMDImporter, createTest) {
-    bool ok(true);
-    try {
-        SMDImporter myImporter;
-    } catch (...) {
-        ok = false;
-    }
-    EXPECT_TRUE(ok);
-}
-
 TEST_F(utSMDImporter, importTest) {
+#ifndef ASSIMP_BUILD_NO_SMD_IMPORTER
    EXPECT_TRUE(importerTest());
+#else
+    EXPECT_FALSE(importerTest());
+#endif
 }

 TEST_F(utSMDImporter, issue_899_Texture_garbage_at_end_of_string_Test) {