1642 changed files with 65434 additions and 195856 deletions
--- a/.coveralls.yml
+++ b/.coveralls.yml
@ -0,0 +1,2 @@
+service_name: travis-pro
+repo_token: GZXuNlublKFy7HAewHAZLk5ZwgipTFAOA
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -1,11 +1,6 @@
 version: 2
 updates:
- package-ecosystem: "github-actions"
+  - package-ecosystem: "github-actions"
    directory: "/"
    schedule:
      interval: "weekly"
-  - package-ecosystem: "gitsubmodule"
-    directory: "/"  # the .gitmodules file must be placed at the top-level directory of a git working tree
-    schedule:
-      interval: "weekly"
-    open-pull-requests-limit: 15  # Assimp has 15 dependencies
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@ -6,140 +6,12 @@ on:
  pull_request:
    branches: [ master ]

-permissions:
-  contents: write # to fetch code (actions/checkout),and release
-
 jobs:
-  build:
+  job:
    name: ${{ matrix.name }}-build-and-test
    runs-on: ${{ matrix.os }}
    strategy:
      fail-fast: false
-      matrix:
-        name: [ubuntu-latest-g++, macos-latest-clang++, windows-latest-cl.exe, ubuntu-latest-clang++]
-        # For Windows msvc, for Linux and macOS let's use the clang compiler, use gcc for Linux.
-        include:
-          - name: windows-latest-cl.exe
-            os: windows-latest
-            cxx: cl.exe
-            cc: cl.exe
-          - name: ubuntu-latest-clang++
-            os: ubuntu-latest
-            cxx: clang++
-            cc: clang
-          - name: macos-latest-clang++
-            os: macos-latest
-            cxx: clang++
-            cc: clang
-          - name: ubuntu-latest-g++
-            os: ubuntu-latest
-            cxx: g++
-            cc: gcc
-
-    steps:
-    - name: ccache
-      uses: hendrikmuhs/ccache-action@v1.2
-      
-    - uses: actions/checkout@v4
-      with:
-          submodules: true
-          
-    - uses: lukka/get-cmake@latest
-    
-    - uses: ilammy/msvc-dev-cmd@v1
-    
-    - name: Set Compiler Environment
-      uses: lukka/set-shell-env@v1
-      with:
-        CXX: ${{ matrix.cxx }}
-        CC: ${{ matrix.cc }}
-
-    - name: Cache DX SDK
-      id: dxcache
-      if: contains(matrix.name, 'windows')
-      uses: actions/cache@v4
-      with:
-        path: '${{ github.workspace }}/DX_SDK'
-        key: ${{ runner.os }}-DX_SDK
-        restore-keys: |
-          ${{ runner.os }}-DX_SDK
-
-    - name: Download DXSetup
-      if: contains(matrix.name, 'windows') && steps.dxcache.outputs.cache-hit != 'true'
-      run: |
-        curl -s -o DXSDK_Jun10.exe --location https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/DXSDK_Jun10.exe
-        cmd.exe /c start /wait .\DXSDK_Jun10.exe /U /O /F /S /P "${{ github.workspace }}\DX_SDK"
-
-    - name: Set Windows specific CMake arguments
-      if: contains(matrix.name, 'windows')
-      id: windows_extra_cmake_args
-      run: echo ":set-output name=args::=-DASSIMP_BUILD_ASSIMP_TOOLS=1 -DASSIMP_BUILD_ASSIMP_VIEW=1" >> $GITHUB_OUTPUT
-    
-    - name: Set Hunter specific CMake arguments
-      if: contains(matrix.name, 'hunter')
-      id: hunter_extra_cmake_args
-      run: echo "args=-DBUILD_SHARED_LIBS=OFF -DASSIMP_HUNTER_ENABLED=ON -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/cmake/polly/${{ matrix.toolchain }}.cmake" >> $GITHUB_OUTPUT
-
-    - name: configure and build
-      uses: lukka/run-cmake@v3
-      env:
-        DXSDK_DIR: '${{ github.workspace }}/DX_SDK'
-
-      with:
-        cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
-        cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
-        cmakeAppendedArgs: '-GNinja -DCMAKE_BUILD_TYPE=Release ${{ steps.windows_extra_cmake_args.outputs.args }} ${{ steps.hunter_extra_cmake_args.outputs.args }}'
-        buildWithCMakeArgs: '--parallel 24 -v'
-        buildDirectory: '${{ github.workspace }}/build/'
-        
-    - name: Exclude certain tests in Hunter specific builds
-      if: contains(matrix.name, 'hunter')
-      id: hunter_extra_test_args
-      run: echo "args=--gtest_filter=-utOpenGEXImportExport.Importissue1340_EmptyCameraObject:utColladaZaeImportExport.importBlenFromFileTest" >> $GITHUB_OUTPUT
-
-    - name: test
-      run: cd build/bin && ./unit ${{ steps.hunter_extra_test_args.outputs.args }}
-      shell: bash
-
-    - uses: actions/upload-artifact@v4
-      if: matrix.name == 'windows-msvc'
-      with:
-        name: 'assimp-bins-${{ matrix.name }}'
-        path: build/bin/assimp*.exe
-        
-    - uses: marvinpinto/action-automatic-releases@latest
-      if: contains(matrix.name, 'windows-msvc-hunter')
-      with:
-        repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        automatic_release_tag: "master"
-        prerelease: true
-        title: "AutoRelease"
-        files: |
-          build/bin/assimp*.exe
-
-  create-release:
-    needs: [build]
-    runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/')
-    steps:
-      - id: create-release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: '${{secrets.GITHUB_TOKEN}}'
-        with:
-          tag_name: '${{github.ref}}'
-          release_name: 'Release ${{github.ref}}'
-          draft: false
-          prerelease: true
-      - run: |
-          echo '${{steps.create-release.outputs.upload_url}}' > release_upload_url.txt
-      - uses: actions/upload-artifact@v4
-        with:
-          name: create-release
-          path: release_upload_url.txt
-
-  upload-release:
-    strategy:
      matrix:
        name: [ubuntu-latest-g++, macos-latest-clang++, windows-latest-cl.exe, ubuntu-latest-clang++, ubuntu-gcc-hunter, macos-clang-hunter, windows-msvc-hunter]
        # For Windows msvc, for Linux and macOS let's use the clang compiler, use gcc for Linux.
@ -169,24 +41,89 @@ jobs:
          - name: windows-msvc-hunter
            os: windows-latest
            toolchain: ninja-vs-win64-cxx17
-            
-    needs: [create-release]
-    runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/')
+
    steps:
-      - uses: softprops/action-gh-release@v2
-        with:
-          name: create-release
-      - id: upload-url
-        run: |
-          echo "url=$(cat create-release/release_upload_url.txt)" >> $GITHUB_OUTPUT
-      - uses: actions/download-artifact@v4
-        with:
-          name: 'assimp-bins-${{ matrix.name }}-${{ github.sha }}'
-      - uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: '${{secrets.GITHUB_TOKEN}}'
-        with:
-          files: |
-            *.zip
- 
+    - uses: actions/checkout@v3
+    
+    - uses: lukka/get-cmake@latest
+    
+    - uses: ilammy/msvc-dev-cmd@v1
+    
+    - name: Set Compiler Environment
+      if: "!endsWith(matrix.name, 'hunter')"
+      uses: lukka/set-shell-env@v1
+      with:
+        CXX: ${{ matrix.cxx }}
+        CC: ${{ matrix.cc }}
+
+    - name: Set Compiler Environment for Hunter on Windows
+      if: startsWith(matrix.name, 'windows') && endsWith(matrix.name, 'hunter')
+      uses: lukka/set-shell-env@v1
+      with:
+        VS160COMNTOOLS: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools
+
+    - name: Checkout Hunter toolchains
+      if: endsWith(matrix.name, 'hunter')
+      uses: actions/checkout@v3
+      with:
+        repository: cpp-pm/polly
+        path: cmake/polly
+
+    - name: Remove contrib directory for Hunter builds
+      if: contains(matrix.name, 'hunter')
+      uses: JesseTG/rm@v1.0.3
+      with:
+        path: contrib
+
+    - name: Cache DX SDK
+      id: dxcache
+      if: contains(matrix.name, 'windows')
+      uses: actions/cache@v3
+      with:
+        path: '${{ github.workspace }}/DX_SDK'
+        key: ${{ runner.os }}-DX_SDK
+        restore-keys: |
+          ${{ runner.os }}-DX_SDK
+
+    - name: Download DXSetup
+      if: contains(matrix.name, 'windows') && steps.dxcache.outputs.cache-hit != 'true'
+      run: |
+        curl -s -o DXSDK_Jun10.exe --location https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/DXSDK_Jun10.exe
+        cmd.exe /c start /wait .\DXSDK_Jun10.exe /U /O /F /S /P "${{ github.workspace }}\DX_SDK"
+
+    - name: Set Windows specific CMake arguments
+      if: contains(matrix.name, 'windows')
+      id: windows_extra_cmake_args
+      run: echo "::set-output name=args::-DASSIMP_BUILD_ASSIMP_TOOLS=1 -DASSIMP_BUILD_ASSIMP_VIEW=1"
+    
+    - name: Set Hunter specific CMake arguments
+      if: contains(matrix.name, 'hunter')
+      id: hunter_extra_cmake_args
+      run: echo "::set-output name=args::-DBUILD_SHARED_LIBS=OFF -DASSIMP_HUNTER_ENABLED=ON -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/cmake/polly/${{ matrix.toolchain }}.cmake"
+
+    - name: configure and build
+      uses: lukka/run-cmake@v3
+      env:
+        DXSDK_DIR: '${{ github.workspace }}/DX_SDK'
+
+      with:
+        cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
+        cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
+        cmakeAppendedArgs: '-GNinja -DCMAKE_BUILD_TYPE=Release ${{ steps.windows_extra_cmake_args.outputs.args }} ${{ steps.hunter_extra_cmake_args.outputs.args }}'
+        buildWithCMakeArgs: '-- -j 24 -v'
+        buildDirectory: '${{ github.workspace }}/build/'
+        
+    - name: Exclude certain tests in Hunter specific builds
+      if: contains(matrix.name, 'hunter')
+      id: hunter_extra_test_args
+      run: echo "::set-output name=args::--gtest_filter=-utOpenGEXImportExport.Importissue1340_EmptyCameraObject:utColladaZaeImportExport.importBlenFromFileTest"
+
+    - name: test
+      run: cd build/bin && ./unit ${{ steps.hunter_extra_test_args.outputs.args }}
+      shell: bash
+
+    - uses: actions/upload-artifact@v3
+      if: matrix.name == 'windows-msvc'
+      with:
+        name: 'assimp-bins-${{ matrix.name }}-${{ github.sha }}'
+        path: build/bin
--- a/.github/workflows/cifuzz.yml
+++ b/.github/workflows/cifuzz.yml
@ -1,26 +0,0 @@
-name: CIFuzz
-on: [pull_request]
-jobs:
-  Fuzzing:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Build Fuzzers
-      id: build
-      uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
-      with:
-        oss-fuzz-project-name: 'assimp'
-        dry-run: false
-        language: c++
-    - name: Run Fuzzers
-      uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
-      with:
-        oss-fuzz-project-name: 'assimp'
-        fuzz-seconds: 300
-        dry-run: false
-        language: c++
-    - name: Upload Crash
-      uses: actions/upload-artifact@v4
-      if: failure() && steps.build.outcome == 'success'
-      with:
-        name: artifacts
-        path: ./out/artifacts
--- a/.github/workflows/inno_setup
+++ b/.github/workflows/inno_setup
@ -1,51 +0,0 @@
-name: Build Windows Installer
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-jobs:
-  build:
-    name: Build the Inno Setup Installer
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: lukka/get-cmake@latest
-      - uses: ilammy/msvc-dev-cmd@v1
-
-
-      - name: Cache DX SDK
-        id: dxcache
-        uses: actions/cache@v4
-        with:
-          path: '${{ github.workspace }}/DX_SDK'
-          key: ${{ runner.os }}-DX_SDK
-          restore-keys: |
-            ${{ runner.os }}-DX_SDK
-
-      - name: Download DXSetup
-        run: |
-          curl -s -o DXSDK_Jun10.exe --location https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/DXSDK_Jun10.exe
-          cmd.exe /c start /wait .\DXSDK_Jun10.exe /U /O /F /S /P "${{ github.workspace }}\DX_SDK"
-
-      - name: Set Windows specific CMake arguments
-        id: windows_extra_cmake_args
-        run: echo "::set-output name=args::-DASSIMP_BUILD_ASSIMP_TOOLS=1 -DASSIMP_BUILD_ASSIMP_VIEW=1 -DASSIMP_BUILD_ZLIB=1"
-
-      - name: configure and build
-        uses: lukka/run-cmake@v3
-        env:
-          DXSDK_DIR: '${{ github.workspace }}/DX_SDK'
-
-        with:
-          cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
-          cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
-          cmakeAppendedArgs: '-GNinja -DCMAKE_BUILD_TYPE=Release ${{ steps.windows_extra_cmake_args.outputs.args }} ${{ steps.hunter_extra_cmake_args.outputs.args }}'
-          buildWithCMakeArgs: '--parallel 24 -v'
-          buildDirectory: '${{ github.workspace }}/build/'
-
-      - name: Compile .ISS to .EXE Installer
-        uses: Minionguyjpro/Inno-Setup-Action@v1.2.2
-        with:
-          path: packaging/windows-innosetup/script_x64.iss
-          options: /O+
--- a/.github/workflows/sanitizer.yml
+++ b/.github/workflows/sanitizer.yml
@ -6,15 +6,12 @@ on:
  pull_request:
    branches: [ master ]

-permissions:
-  contents: read # to fetch code (actions/checkout)
-
 jobs:
  job1:
    name: adress-sanitizer
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
    - uses: lukka/get-cmake@latest    
    - uses: lukka/set-shell-env@v1
      with:
@ -38,7 +35,7 @@ jobs:
    name: undefined-behavior-sanitizer
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
    - uses: lukka/get-cmake@latest    
    - uses: lukka/set-shell-env@v1
      with:
@ -46,7 +43,7 @@ jobs:
        CC: clang
    
    - name: configure and build
-      uses: lukka/run-cmake@v3
+      uses: lukka/run-cmake@v2
      with:
        cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
        cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
@ -57,13 +54,3 @@ jobs:
    - name: test
      run: cd build/bin && ./unit
      shell: bash
-
-  job3:
-    name: printf-sanitizer
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    
-    - name: run scan_printf script
-      run: ./scripts/scan_printf.sh
-      shell: bash
--- a/.gitignore
+++ b/.gitignore
@ -120,7 +120,3 @@ tools/assimp_qt_viewer/ui_mainwindow.h

 #Generated directory
 generated/*
-
-# 3rd party cloned repos/tarballs etc
-# tinyusdz repo, automatically cloned via CMake
-contrib/tinyusdz/autoclone
--- a/Build.md
+++ b/Build.md
@ -7,7 +7,7 @@ You can download and install assimp using the [vcpkg](https://github.com/Microso
    cd vcpkg
    ./bootstrap-vcpkg.sh
    ./vcpkg integrate install
-    ./vcpkg install assimp
+    vcpkg install assimp
 ```
 The assimp port in vcpkg is kept up to date by Microsoft team members and community contributors. If the version is out of date, please [create an issue or pull request](https://github.com/Microsoft/vcpkg) on the vcpkg repository.

@ -27,7 +27,7 @@ pip install pyassimp
 ## Manual build instructions

 ### Install CMake
-Asset-Importer-Lib can be built for a lot of different platforms. We are using cmake to generate the build environment for these via cmake. So you have to make sure that you have a working cmake-installation on your system. You can download it at https://cmake.org/ or for linux install it via
+Asset-Importer-Lib can be build for a lot of different platforms. We are using cmake to generate the build environment for these via cmake. So you have to make sure that you have a working cmake-installation on your system. You can download it at https://cmake.org/ or for linux install it via
 ```bash
 sudo apt-get install cmake
 ```
@ -43,16 +43,15 @@ cd assimp
 cmake CMakeLists.txt 
 cmake --build .
 ```
-Note that by default this builds a shared library into the `bin` directory. If you want to build it as a static library see the build options at the bottom of this file.

 ### Build instructions for Windows with Visual-Studio

-First, you have to install Visual-Studio on your windows-system. You can get the Community-Version for free here: https://visualstudio.microsoft.com/de/downloads/
+First you have to install Visual-Studio on your windows-system. You can get the Community-Version for free here: https://visualstudio.microsoft.com/de/downloads/
 To generate the build environment for your IDE open a command prompt, navigate to your repo and type:
 ```bash
 cmake CMakeLists.txt
 ```
-This will generate the project files for the visual studio. All dependencies used to build Asset-Importer-Lib shall be part of the repo. If you want to use you own zlib installation this is possible as well. Check the options for it.
+This will generate the project files for the visual studio. All dependencies used to build Asset-IMporter-Lib shall be part of the repo. If you want to use you own zlib.installation this is possible as well. Check the options for it.

 ### Build instructions for Windows with UWP
 See <https://stackoverflow.com/questions/40803170/cmake-uwp-using-cmake-to-build-universal-windows-app>
@ -64,9 +63,9 @@ Open a terminal and got to your repository. You can generate the makefiles and b
 cmake CMakeLists.txt
 make -j4
 ```
-The option -j describes the number of parallel processes for the build. In this case make will try to use 4 cores for the build.
+The option -j descripes the number of parallel processes for the build. In this case make will try to use 4 cores for the build.

-If you want to use an IDE for linux you can try QTCreator for instance. 
+If you want to use a IDE for linux you can try QTCreator for instance. 

 ### Build instructions for MinGW
 Older versions of MinGW's compiler (e.g. 5.1.0) do not support the -mbig_obj flag 
@ -94,9 +93,9 @@ The cmake-build-environment provides options to configure the build. The followi
 - **ASSIMP_ANDROID_JNIIOSYSTEM (default OFF)**: Android JNI IOSystem support is active.
 - **ASSIMP_NO_EXPORT (default OFF)**: Disable Assimp's export functionality.
 - **ASSIMP_BUILD_ZLIB (default OFF)**: Build our own zlib.
- **ASSIMP_BUILD_ALL_EXPORTERS_BY_DEFAULT (default ON)**: Build Assimp with all exporters enabled.
- **ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT (default ON)**: Build Assimp with all importers enabled.
- **ASSIMP_BUILD_ASSIMP_TOOLS (default OFF)**: If the supplementary tools for Assimp are built in addition to the library.
+- **ASSIMP_BUILD_ALL_EXPORTERS_BY_DEFAULT (default ON)**: Build Assimp with all exporter senabled.
+- **ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT (default ON)**: Build Assimp with all importer senabled.
+- **ASSIMP_BUILD_ASSIMP_TOOLS (default ON)**: If the supplementary tools for Assimp are built in addition to the library.
 - **ASSIMP_BUILD_SAMPLES (default OFF)**: If the official samples are built as well (needs Glut).
 - **ASSIMP_BUILD_TESTS (default ON)**: If the test suite for Assimp is built in addition to the library.
 - **ASSIMP_COVERALLS (default OFF)**: Enable this to measure test coverage.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,6 +1,6 @@
 # Open Asset Import Library (assimp)
 # ----------------------------------------------------------------------
-# Copyright (c) 2006-2024, assimp team
+# Copyright (c) 2006-2022, assimp team
 #
 # All rights reserved.
 #
@ -38,25 +38,9 @@ SET(CMAKE_POLICY_DEFAULT_CMP0012 NEW)
 SET(CMAKE_POLICY_DEFAULT_CMP0074 NEW)
 SET(CMAKE_POLICY_DEFAULT_CMP0092 NEW)

-CMAKE_MINIMUM_REQUIRED( VERSION 3.22 )
+CMAKE_MINIMUM_REQUIRED( VERSION 3.10 )

-# Experimental USD importer: disabled, need to opt-in
-# Note: assimp github PR automatic checks will fail the PR due to compiler warnings in
-# the external, 3rd party tinyusdz code which isn't technically part of the PR since it's
-# auto-cloned during build; so MUST disable the feature or the PR will be rejected
-option(ASSIMP_BUILD_USD_IMPORTER "Enable USD file import" off)
-option(ASSIMP_BUILD_USD_VERBOSE_LOGS "Enable verbose USD import debug logging" off)
-option(ASSIMP_BUILD_USE_CCACHE "Use ccache to speed up compilation." on)
-
-if(ASSIMP_BUILD_USE_CCACHE)
-  find_program(CCACHE_PATH ccache)
-  if (CCACHE_PATH)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE_PATH})
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE_PATH})
-  endif()
-endif()
-
-# Disabled importers: m3d for 5.1 or later
+# Disabled importers: m3d for 5.1
 ADD_DEFINITIONS( -DASSIMP_BUILD_NO_M3D_IMPORTER)
 ADD_DEFINITIONS( -DASSIMP_BUILD_NO_M3D_EXPORTER)
 # Toggles the use of the hunter package manager
@ -65,13 +49,14 @@ option(ASSIMP_HUNTER_ENABLED "Enable Hunter package manager support" OFF)
 IF(ASSIMP_HUNTER_ENABLED)
  include("cmake-modules/HunterGate.cmake")
  HunterGate(
-    URL "https://github.com/cpp-pm/hunter/archive/v0.25.5.tar.gz"
-    SHA1 "a20151e4c0740ee7d0f9994476856d813cdead29"
+    URL "https://github.com/cpp-pm/hunter/archive/v0.24.0.tar.gz"
+    SHA1 "a3d7f4372b1dcd52faa6ff4a3bd5358e1d0e5efd"
  )
+
  add_definitions(-DASSIMP_USE_HUNTER)
 ENDIF()

-PROJECT(Assimp VERSION 5.4.3)
+PROJECT(Assimp VERSION 5.2.4)

 # All supported options ###############################################

@ -99,6 +84,10 @@ OPTION( ASSIMP_NO_EXPORT
  "Disable Assimp's export functionality."
  OFF
 )
+OPTION( ASSIMP_BUILD_ZLIB
+  "Build your own zlib"
+  OFF
+)
 OPTION( ASSIMP_BUILD_ASSIMP_TOOLS
  "If the supplementary tools for Assimp are built in addition to the library."
  OFF
@ -146,36 +135,24 @@ OPTION ( ASSIMP_IGNORE_GIT_HASH
 )

 IF (WIN32)
-  OPTION( ASSIMP_BUILD_ZLIB
-    "Build your zlib"
-    ON
-  )
-ELSE()
-  OPTION( ASSIMP_BUILD_ZLIB
-    "Build your zlib"
-    OFF
-  )
-ENDIF()
-
-IF (WIN32)
-  # Use a subset of Windows.h
+  # Use subset of Windows.h
  ADD_DEFINITIONS( -DWIN32_LEAN_AND_MEAN )

  IF(MSVC)
    OPTION( ASSIMP_INSTALL_PDB
-      "Create MSVC debug symbol files and add to Install target."
+      "Install MSVC debug files."
      ON )
    IF(NOT (MSVC_VERSION LESS 1900))
-      # Multibyte character set has been deprecated since at least MSVC2015 (possibly earlier)
+      # Multibyte character set is deprecated since at least MSVC2015 (possibly earlier)
      ADD_DEFINITIONS( -DUNICODE -D_UNICODE )
    ENDIF()

-    # Link statically against c/c++ lib to avoid missing redistributable such as
+    # Link statically against c/c++ lib to avoid missing redistriburable such as
    # "VCRUNTIME140.dll not found. Try reinstalling the app.", but give users
    # a choice to opt for the shared runtime if they want.
    option(USE_STATIC_CRT "Link against the static runtime libraries." OFF)

-    # The CMAKE_CXX_FLAGS vars can be overridden by some Visual Studio generators, so we use an alternative
+    # The CMAKE_CXX_FLAGS vars can be overriden by some Visual Studio generators, so we use an alternative
    # global method here:
    if (${USE_STATIC_CRT})
      add_compile_options(
@ -216,9 +193,12 @@ SET (ASSIMP_VERSION ${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}.${ASSIMP_VER
 SET (ASSIMP_SOVERSION 5)

 SET( ASSIMP_PACKAGE_VERSION "0" CACHE STRING "the package-specific version used for uploading the sources" )
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_C_STANDARD 99)
+if(NOT ASSIMP_HUNTER_ENABLED)
+  # Enable C++11 support globally
+  set(CMAKE_CXX_STANDARD 11)
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
+  set(CMAKE_C_STANDARD 99)
+endif()

 IF(NOT ASSIMP_IGNORE_GIT_HASH)
  # Get the current working branch
@ -265,60 +245,49 @@ SET(ASSIMP_LIBRARY_SUFFIX "" CACHE STRING "Suffix to append to library names")
 IF( UNIX )
  # Use GNUInstallDirs for Unix predefined directories
  INCLUDE(GNUInstallDirs)
-  # Ensure that we do not run into issues like http://www.tcm.phy.cam.ac.uk/sw/inodes64.html on 32 bit Linux
-  IF(NOT ${OPERATING_SYSTEM} MATCHES "Android")
-    IF ( CMAKE_SIZEOF_VOID_P EQUAL 4) # only necessary for 32-bit Linux
+  # Ensure that we do not run into issues like http://www.tcm.phy.cam.ac.uk/sw/inodes64.html on 32 bit linux
+  IF( ${OPERATING_SYSTEM} MATCHES "Android")
+  ELSE()
+    IF ( CMAKE_SIZEOF_VOID_P EQUAL 4) # only necessary for 32-bit linux
      ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64 )
    ENDIF()
  ENDIF()
 ENDIF()

 # Grouped compiler settings ########################################
-IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT MINGW AND NOT HAIKU)
+IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT MINGW)
  IF(NOT ASSIMP_HUNTER_ENABLED)
+    SET(CMAKE_CXX_STANDARD 11)
    SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
  ENDIF()
-
-  IF(CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 13)
-    MESSAGE(STATUS "GCC13 detected disabling \"-Wdangling-reference\" in Cpp files as it appears to be a false positive")
-    ADD_COMPILE_OPTIONS("$<$<COMPILE_LANGUAGE:CXX>:-Wno-dangling-reference>")
-  ENDIF()
  # hide all not-exported symbols
  IF(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64" )
-    SET(CMAKE_CXX_FLAGS "-mxgot -fvisibility=hidden -fno-strict-aliasing -Wall ${CMAKE_CXX_FLAGS}")
-    SET(CMAKE_C_FLAGS "-fno-strict-aliasing ${CMAKE_C_FLAGS}")
-    SET(LIBSTDC++_LIBRARIES -lstdc++)
+	SET(CMAKE_CXX_FLAGS "-mxgot -fvisibility=hidden -fno-strict-aliasing -Wall ${CMAKE_CXX_FLAGS}")
+	SET(CMAKE_C_FLAGS "-fno-strict-aliasing ${CMAKE_C_FLAGS}")
+	SET(LIBSTDC++_LIBRARIES -lstdc++)
  ELSE()
-    SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -fno-strict-aliasing -Wall ${CMAKE_CXX_FLAGS}")
-    SET(CMAKE_C_FLAGS "-fno-strict-aliasing ${CMAKE_C_FLAGS}")
-    SET(LIBSTDC++_LIBRARIES -lstdc++)
+	SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -fno-strict-aliasing -Wall ${CMAKE_CXX_FLAGS}")
+	SET(CMAKE_C_FLAGS "-fno-strict-aliasing ${CMAKE_C_FLAGS}")
+	SET(LIBSTDC++_LIBRARIES -lstdc++)
  ENDIF()
 ELSEIF(MSVC)
  # enable multi-core compilation with MSVC
  IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) # clang-cl
-    ADD_COMPILE_OPTIONS(/bigobj)
+    ADD_COMPILE_OPTIONS(/bigobj /W4 /WX )
  ELSE() # msvc
-    ADD_COMPILE_OPTIONS(/MP /bigobj)
+    ADD_COMPILE_OPTIONS(/MP /bigobj /W4 /WX)
  ENDIF()
-
  # disable "elements of array '' will be default initialized" warning on MSVC2013
  IF(MSVC12)
-    ADD_COMPILE_OPTIONS(/wd4351)
+    ADD_COMPILE_OPTIONS(/wd4351)	
  ENDIF()
-  # supress warning for double to float conversion if Double precision is activated
-  ADD_COMPILE_OPTIONS(/wd4244)
+  ADD_COMPILE_OPTIONS(/wd4244) #supress warning for double to float conversion if Double precission is activated
  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_DEBUG /Zi /Od")
-  # Allow user to disable PDBs
-  if(ASSIMP_INSTALL_PDB)
-    SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi")
-    SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG:FULL /PDBALTPATH:%_PDB% /OPT:REF /OPT:ICF")
-  elseif((GENERATOR_IS_MULTI_CONFIG) OR (CMAKE_BUILD_TYPE MATCHES Release))
-    message("-- MSVC PDB generation disabled. Release binary will not be debuggable.")
-  endif()
-  # Source code is encoded in UTF-8
-  ADD_COMPILE_OPTIONS(/source-charset:utf-8)
+  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi")
+  SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG:FULL /PDBALTPATH:%_PDB% /OPT:REF /OPT:ICF")
 ELSEIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
  IF(NOT ASSIMP_HUNTER_ENABLED)
+    SET(CMAKE_CXX_STANDARD 11)
    SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
  ENDIF()
  SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -fno-strict-aliasing -Wall -Wno-long-long ${CMAKE_CXX_FLAGS}" )
@ -330,30 +299,30 @@ ELSEIF( MINGW )
    message(WARNING "MinGW is old, if you experience errors, update MinGW.")
  ENDIF()
  IF(NOT ASSIMP_HUNTER_ENABLED)
-    SET(CMAKE_CXX_FLAGS "-std=gnu++17 ${CMAKE_CXX_FLAGS}")
+    SET(CMAKE_CXX_FLAGS "-std=gnu++11 ${CMAKE_CXX_FLAGS}")
    SET(CMAKE_C_FLAGS "-fPIC ${CMAKE_C_FLAGS}")
  ENDIF()
    IF (CMAKE_BUILD_TYPE STREQUAL "Debug")
-      SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -fno-strict-aliasing -Wno-dangling-reference -Wall -Wno-long-long -Wa,-mbig-obj -g ${CMAKE_CXX_FLAGS}")
+      SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -fno-strict-aliasing -Wall -Wno-long-long -Wa,-mbig-obj -g ${CMAKE_CXX_FLAGS}")
    ELSE()
-      SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -fno-strict-aliasing -Wno-dangling-reference -Wall -Wno-long-long -Wa,-mbig-obj -O3 ${CMAKE_CXX_FLAGS}")
+      SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -fno-strict-aliasing -Wall -Wno-long-long -Wa,-mbig-obj -O3 ${CMAKE_CXX_FLAGS}")
    ENDIF()
    SET(CMAKE_C_FLAGS "-fno-strict-aliasing ${CMAKE_C_FLAGS}")
 ENDIF()

 IF ( IOS AND NOT ASSIMP_HUNTER_ENABLED)
  IF (CMAKE_BUILD_TYPE STREQUAL "Debug")
-    SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fembed-bitcode -Og")
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fembed-bitcode -Og")
    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fembed-bitcode -Og")
  ELSE()
-    SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fembed-bitcode -O3")
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fembed-bitcode -O3")
    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fembed-bitcode -O3")
+    # Experimental for pdb generation
  ENDIF()
 ENDIF()

 IF (ASSIMP_COVERALLS)
  MESSAGE(STATUS "Coveralls enabled")
-
  INCLUDE(Coveralls)
  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
@ -361,16 +330,14 @@ ENDIF()

 IF (ASSIMP_ASAN)
  MESSAGE(STATUS "AddressSanitizer enabled")
-
  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
-  SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fsanitize=address")
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
 ENDIF()

 IF (ASSIMP_UBSAN)
  MESSAGE(STATUS "Undefined Behavior sanitizer enabled")
-
  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined,shift,shift-exponent,integer-divide-by-zero,unreachable,vla-bound,null,return,signed-integer-overflow,bounds,float-divide-by-zero,float-cast-overflow,nonnull-attribute,returns-nonnull-attribute,bool,enum,vptr,pointer-overflow,builtin -fno-sanitize-recover=all")
-  SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fsanitize=undefined,shift,shift-exponent,integer-divide-by-zero,unreachable,vla-bound,null,return,signed-integer-overflow,bounds,float-divide-by-zero,float-cast-overflow,nonnull-attribute,returns-nonnull-attribute,bool,enum,vptr,pointer-overflow,builtin -fno-sanitize-recover=all")
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=undefined,shift,shift-exponent,integer-divide-by-zero,unreachable,vla-bound,null,return,signed-integer-overflow,bounds,float-divide-by-zero,float-cast-overflow,nonnull-attribute,returns-nonnull-attribute,bool,enum,vptr,pointer-overflow,builtin -fno-sanitize-recover=all")
 ENDIF()

 INCLUDE (FindPkgMacros)
@ -421,6 +388,13 @@ IF (NOT TARGET uninstall AND ASSIMP_INSTALL)
  ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
 ENDIF()

+# cmake configuration files
+if(${BUILD_SHARED_LIBS})
+  set(BUILD_LIB_TYPE SHARED)
+else()
+  set(BUILD_LIB_TYPE STATIC)
+endif()
+
 IF( UNIX )
  # Use GNUInstallDirs for Unix predefined directories
  INCLUDE(GNUInstallDirs)
@ -475,20 +449,18 @@ configure_package_config_file(
    INSTALL_DESTINATION "${CONFIG_INSTALL_DIR}"
 )

-if(ASSIMP_INSTALL)
-  install(
-      FILES "${PROJECT_CONFIG}" "${VERSION_CONFIG}"
-      DESTINATION "${CONFIG_INSTALL_DIR}"
-      COMPONENT ${LIBASSIMP-DEV_COMPONENT}
-  )
+install(
+    FILES "${PROJECT_CONFIG}" "${VERSION_CONFIG}"
+    DESTINATION "${CONFIG_INSTALL_DIR}"
+    COMPONENT ${LIBASSIMP-DEV_COMPONENT}
+)

-  install(
-      EXPORT "${TARGETS_EXPORT_NAME}"
-      NAMESPACE "${NAMESPACE}"
-      DESTINATION "${CONFIG_INSTALL_DIR}"
-      COMPONENT ${LIBASSIMP-DEV_COMPONENT}
-  )
-endif()
+install(
+    EXPORT "${TARGETS_EXPORT_NAME}"
+    NAMESPACE "${NAMESPACE}"
+    DESTINATION "${CONFIG_INSTALL_DIR}"
+    COMPONENT ${LIBASSIMP-DEV_COMPONENT}
+)

 IF( ASSIMP_BUILD_DOCS )
  ADD_SUBDIRECTORY(doc)
@ -506,7 +478,7 @@ IF(ASSIMP_HUNTER_ENABLED)
  set(ASSIMP_BUILD_MINIZIP TRUE)
 ELSE()
  # If the zlib is already found outside, add an export in case assimpTargets can't find it.
-  IF( ZLIB_FOUND AND ASSIMP_INSTALL)
+  IF( ZLIB_FOUND )
    INSTALL( TARGETS zlib zlibstatic
        EXPORT "${TARGETS_EXPORT_NAME}")
  ENDIF()
@ -515,11 +487,7 @@ ELSE()
    FIND_PACKAGE(ZLIB)
  ENDIF()

-  IF ( NOT ZLIB_FOUND AND NOT ASSIMP_BUILD_ZLIB )
-    message( FATAL_ERROR
-      "Build configured with -DASSIMP_BUILD_ZLIB=OFF but unable to find zlib"
-    )
-  ELSEIF( NOT ZLIB_FOUND )
+  IF( NOT ZLIB_FOUND )
    MESSAGE(STATUS "compiling zlib from sources")
    INCLUDE(CheckIncludeFile)
    INCLUDE(CheckTypeSize)
@ -588,15 +556,11 @@ SET ( ASSIMP_BUILD_NONFREE_C4D_IMPORTER OFF CACHE BOOL
 )

 IF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER)
-  SET(C4D_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/contrib/Cineware/includes")
+  IF ( MSVC )
+    SET(C4D_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/contrib/Cineware/includes")

-  IF (WIN32)
    # pick the correct prebuilt library
-    IF(MSVC143)
-      SET(C4D_LIB_POSTFIX "_2022")
-    ELSEIF(MSV142)
-      SET(C4D_LIB_POSTFIX "_2019")
-    ELSEIF(MSVC15)
+    IF(MSVC15)
      SET(C4D_LIB_POSTFIX "_2017")
    ELSEIF(MSVC14)
      SET(C4D_LIB_POSTFIX "_2015")
@ -608,7 +572,7 @@ IF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER)
      SET(C4D_LIB_POSTFIX "_2010")
    ELSE()
      MESSAGE( FATAL_ERROR
-        "C4D for Windows is currently only supported with MSVC 10, 11, 12, 14, 14.2, 14.3"
+        "C4D is currently only supported with MSVC 10, 11, 12, 14"
      )
    ENDIF()

@ -626,30 +590,15 @@ IF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER)
    # winsock and winmm are necessary (and undocumented) dependencies of Cineware SDK because
    # it can be used to communicate with a running Cinema 4D instance
    SET(C4D_EXTRA_LIBRARIES WSock32.lib Winmm.lib)
-  ELSEIF (APPLE)
-    SET(C4D_LIB_BASE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/contrib/Cineware/libraries/osx")
-
-    SET(C4D_DEBUG_LIBRARIES
-      "${C4D_LIB_BASE_PATH}/debug/libcinewarelib.a"
-      "${C4D_LIB_BASE_PATH}/debug/libjpeglib.a"
-    )
-    SET(C4D_RELEASE_LIBRARIES
-      "${C4D_LIB_BASE_PATH}/release/libcinewarelib.a"
-      "${C4D_LIB_BASE_PATH}/release/libjpeglib.a"
-    )
  ELSE ()
    MESSAGE( FATAL_ERROR
-      "C4D is currently only available on Windows and macOS with Cineware SDK installed in contrib/Cineware"
+      "C4D is currently only available on Windows with Cineware SDK installed in contrib/Cineware"
    )
  ENDIF ()
 ELSE ()
  ADD_DEFINITIONS( -DASSIMP_BUILD_NO_C4D_IMPORTER )
 ENDIF ()

-if(ASSIMP_BUILD_DRACO_STATIC)
-  set(ASSIMP_BUILD_DRACO ON)
-endif()
-
 # Draco requires cmake 3.12
 IF (DEFINED CMAKE_VERSION AND "${CMAKE_VERSION}" VERSION_LESS "3.12")
  message(NOTICE "draco requires cmake 3.12 or newer, cmake is ${CMAKE_VERSION} . Draco is disabled")
@ -659,7 +608,7 @@ ELSE()
  IF ( ASSIMP_BUILD_DRACO )
    # Primarily for glTF v2
    # Enable Draco glTF feature set
-    set(DRACO_GLTF_BITSTREAM ON CACHE BOOL "" FORCE)
+    set(DRACO_GLTF ON CACHE BOOL "" FORCE)
    # Disable unnecessary or omitted components
    set(DRACO_JS_GLUE OFF CACHE BOOL "" FORCE)
    set(DRACO_WASM OFF CACHE BOOL "" FORCE)
@ -685,29 +634,22 @@ ELSE()
          "-Wno-sign-compare"
          "-Wno-unused-local-typedefs"
        )
-
-        if(NOT ASSIMP_BUILD_DRACO_STATIC)
-          # Draco 1.4.1 does not explicitly export any symbols under GCC/clang
-          list(APPEND DRACO_CXX_FLAGS
-            "-fvisibility=default"
-          )
-        endif()
+        # Draco 1.4.1 does not explicitly export any symbols under GCC/clang
+        list(APPEND DRACO_CXX_FLAGS
+          "-fvisibility=default"
+        )
      ENDIF()

      # Don't build or install all of Draco by default
      ADD_SUBDIRECTORY( "contrib/draco" EXCLUDE_FROM_ALL )

-      if(ASSIMP_BUILD_DRACO_STATIC)
-        set_property(DIRECTORY "contrib/draco" PROPERTY BUILD_SHARED_LIBS OFF)
-      endif()
-
      if(MSVC OR WIN32)
        set(draco_LIBRARIES "draco")
      else()
-        if(ASSIMP_BUILD_DRACO_STATIC)
-          set(draco_LIBRARIES "draco_static")
-        else()
+        if(BUILD_SHARED_LIBS)
          set(draco_LIBRARIES "draco_shared")
+        else()
+          set(draco_LIBRARIES "draco_static")
        endif()
      endif()

@ -715,13 +657,13 @@ ELSE()
      set_target_properties(draco_encoder draco_decoder PROPERTIES
        EXCLUDE_FROM_ALL TRUE
        EXCLUDE_FROM_DEFAULT_BUILD TRUE
-      )
+        )

      # Do build the draco shared library
      set_target_properties(${draco_LIBRARIES} PROPERTIES
        EXCLUDE_FROM_ALL FALSE
        EXCLUDE_FROM_DEFAULT_BUILD FALSE
-      )
+        )

      TARGET_USE_COMMON_OUTPUT_DIRECTORY(${draco_LIBRARIES})
      TARGET_USE_COMMON_OUTPUT_DIRECTORY(draco_encoder)
@ -730,17 +672,16 @@ ELSE()
      set(draco_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/contrib/draco/src")

      # This is probably wrong
-      if (ASSIMP_INSTALL)
-        INSTALL( TARGETS ${draco_LIBRARIES}
-          EXPORT "${TARGETS_EXPORT_NAME}"
-          LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
-          ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
-          RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR}
-          FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
-          COMPONENT ${LIBASSIMP_COMPONENT}
-          INCLUDES DESTINATION include
-        )
-      endif()
+      INSTALL( TARGETS ${draco_LIBRARIES}
+        EXPORT "${TARGETS_EXPORT_NAME}"
+        LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
+        ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
+        RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR}
+        FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
+        COMPONENT ${LIBASSIMP_COMPONENT}
+        INCLUDES DESTINATION include
+    )
+
    ENDIF()
  ENDIF()
 ENDIF()
@ -784,8 +725,8 @@ IF ( ASSIMP_INSTALL )
 ENDIF()

 CONFIGURE_FILE(
-  ${CMAKE_CURRENT_LIST_DIR}/include/assimp/revision.h.in
-  ${CMAKE_CURRENT_BINARY_DIR}/include/assimp/revision.h
+  ${CMAKE_CURRENT_LIST_DIR}/revision.h.in
+  ${CMAKE_CURRENT_BINARY_DIR}/revision.h
 )

 CONFIGURE_FILE(
@ -826,7 +767,7 @@ IF ( ASSIMP_INSTALL )
    SET(CPACK_DEBIAN_PACKAGE_SECTION  "libs" )
    SET(CPACK_DEBIAN_PACKAGE_DEPENDS  "${CPACK_COMPONENTS_ALL}")
    SET(CPACK_DEBIAN_PACKAGE_SUGGESTS)
-    SET(CPACK_DEBIAN_PACKAGE_NAME     "assimp")
+    SET(cPACK_DEBIAN_PACKAGE_NAME     "assimp")
    SET(CPACK_DEBIAN_PACKAGE_REMOVE_SOURCE_FILES contrib/gtest contrib/zlib workspaces test doc obj samples packaging)
    SET(CPACK_DEBIAN_PACKAGE_SOURCE_COPY svn export --force)
    SET(CPACK_DEBIAN_CHANGELOG)
@ -863,10 +804,6 @@ if(WIN32)
      SET(ASSIMP_MSVC_VERSION "vc140")
    ELSEIF(MSVC15)
      SET(ASSIMP_MSVC_VERSION "vc141")
-    ELSEIF(MSV142)
-      SET(ASSIMP_MSVC_VERSION "vc142")
-    ELSEIF(MSVC143)
-      SET(ASSIMP_MSVC_VERSION "vc143")
    ENDIF()
  ENDIF()

--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@ -1,128 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, religion, or sexual identity
-and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
-  overall community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-.
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series
-of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or
-permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within
-the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.0, available at
-https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct
-enforcement ladder](https://github.com/mozilla/diversity).
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at
-https://www.contributor-covenant.org/translations.
--- a/17
+++ b/17
@ -1,12 +1,16 @@
-FROM ubuntu:22.04
+FROM ubuntu:14.04

-RUN apt-get update && apt-get install --no-install-recommends -y ninja-build \
+RUN apt-get update && apt-get install -y \
    git cmake build-essential software-properties-common

-RUN add-apt-repository ppa:ubuntu-toolchain-r/test && apt-get update 
+RUN add-apt-repository ppa:ubuntu-toolchain-r/test && apt-get update && apt-get install -y gcc-4.9 g++-4.9 && \
+    cd /usr/bin && \
+    rm gcc g++ cpp && \
+    ln -s gcc-4.9 gcc && \
+    ln -s g++-4.9 g++ && \
+    ln -s cpp-4.9 cpp

 WORKDIR /opt
-RUN apt install zlib1g-dev

 # Build Assimp
 RUN git clone https://github.com/assimp/assimp.git /opt/assimp
@ -15,8 +19,7 @@ WORKDIR /opt/assimp

 RUN git checkout master \
    && mkdir build && cd build && \
-    cmake -G 'Ninja' \
+    cmake \
    -DCMAKE_BUILD_TYPE=Release \
-    -DASSIMP_BUILD_ASSIMP_TOOLS=ON \
    .. && \
-    ninja -j4 && ninja install
+    make && make install
--- a/2
+++ b/2
@ -14,4 +14,4 @@ https://assimp-docs.readthedocs.io/en/latest/
 Building Assimp 
 ------------------------------

-Just check the build-instructions which you can find here: https://github.com/assimp/assimp/blob/master/Build.md
+Just check the build-instaructions which you can find here: https://github.com/assimp/assimp/blob/master/Build.md
--- a/Readme.md
+++ b/Readme.md
@ -1,41 +1,42 @@
 Open Asset Import Library (assimp)
 ==================================
-
-Open Asset Import Library is a library to load 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.
-
+A library to import and export various 3d-model-formats including scene-post-processing to generate missing render data.
 ### Current project status ###
 [![Financial Contributors on Open Collective](https://opencollective.com/assimp/all/badge.svg?label=financial+contributors)](https://opencollective.com/assimp) 
 ![C/C++ CI](https://github.com/assimp/assimp/workflows/C/C++%20CI/badge.svg)
+<a href="https://scan.coverity.com/projects/5607">
+  <img alt="Coverity Scan Build Status"
+       src="https://scan.coverity.com/projects/5607/badge.svg"/>
+</a>
 [![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)
+
+[![Coverage Status](https://coveralls.io/repos/github/assimp/assimp/badge.svg?branch=master)](https://coveralls.io/github/assimp/assimp?branch=master)
 [![Join the chat at https://gitter.im/assimp/assimp](https://badges.gitter.im/assimp/assimp.svg)](https://gitter.im/assimp/assimp?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/assimp/assimp.svg)](http://isitmaintained.com/project/assimp/assimp "Average time to resolve an issue")
 [![Percentage of issues still open](http://isitmaintained.com/badge/open/assimp/assimp.svg)](http://isitmaintained.com/project/assimp/assimp "Percentage of issues still open")
+[![Total alerts](https://img.shields.io/lgtm/alerts/g/assimp/assimp.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/assimp/assimp/alerts/)
 <br>

 APIs are provided for C and C++. There are various bindings 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.
+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.

-### Documentation ###
-Read [our latest documentation](https://assimp-docs.readthedocs.io/en/latest/).
+### Latest Doc's ###
+Please check the latest documents at [Asset-Importer-Lib-Doc](https://assimp-docs.readthedocs.io/en/latest/). 

-### Pre-built binaries ###
-Download binaries from [our Itchi Projectspace](https://kimkulling.itch.io/the-asset-importer-lib).
+### Get involved ###
+This is the development repo containing the latest features and bugfixes. For productive use though, we recommend one of the stable releases available from [Github Assimp Releases](https://github.com/assimp/assimp/releases).
+<br>
+You find a bug in the docs? Use [Doc-Repo](https://github.com/assimp/assimp-docs).
+<br>
+Please check our Wiki as well: https://github.com/assimp/assimp/wiki

-### Test data ###
-Clone [our model database](https://github.com/assimp/assimp-mdb).
-
-### Communities ###
- Ask questions at [the Assimp Discussion Board](https://github.com/assimp/assimp/discussions).
- Find us on [https://discord.gg/s9KJfaem](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)
+If you want to check our Model-Database, use the following repo: https://github.com/assimp/assimp-mdb

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

 ### 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.
+Take a look into the https://github.com/assimp/assimp/blob/master/Build.md file. 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 ###
 * [Android](port/AndroidJNI/README.md)
@ -52,31 +53,37 @@ Start by reading [our build instructions](https://github.com/assimp/assimp/blob/

 ### Other tools ###
 [open3mod](https://github.com/acgessler/open3mod) is a powerful 3D model viewer based on Assimp's import and export abilities.
-[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:
+Open Asset Import Library is implemented in C++. The directory structure looks like:

 	/code		Source code
 	/contrib	Third-party libraries
 	/doc		Documentation (doxysource and pre-compiled docs)
-	/fuzz           Contains the test code for the Google Fuzzer project
+	/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
+	/scripts 	Scripts 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
+	/samples	A small number of samples to illustrate possible
+                        use cases for Assimp

 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
+	code/AssetLib/<FormatName>	Implementation for import and export for the format
+
+### Where to get help ###
+For more information, visit [our website](http://assimp.org/). Or check out the `./doc`- folder, which contains the official documentation in HTML format.
+(CHMs for Windows are included in some release packages and should be located right here in the root folder).
+
+If the docs don't solve your problem, ask on [StackOverflow with the assimp-tag](http://stackoverflow.com/questions/tagged/assimp?sort=newest). If you think you found a bug, please open an issue on Github.
+
+Open Asset Import Library is a library to load 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.
+
+And we also have a Gitter-channel:Gitter [![Join the chat at https://gitter.im/assimp/assimp](https://badges.gitter.im/assimp/assimp.svg)](https://gitter.im/assimp/assimp?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)<br>

 ### Contributing ###
 Contributions to assimp are highly appreciated. The easiest way to get involved is to submit
@ -113,4 +120,4 @@ and don't sue us if our code doesn't work. Note that, unlike LGPLed code, you ma
 For the legal details, see the `LICENSE` file.

 ### Why this name ###
-Sorry, we're germans :-), no English native speakers ...
+Sorry, we're germans :-), no english native speakers ...
--- a/cmake-modules/FindPkgMacros.cmake
+++ b/cmake-modules/FindPkgMacros.cmake
@ -54,7 +54,7 @@ macro(clear_if_changed TESTVAR)
      set(${var} "NOTFOUND" CACHE STRING "x" FORCE)
    endforeach(var)
  endif ()
-  set(${TESTVAR}_INT_CHECK "${${TESTVAR}}" CACHE INTERNAL "x" FORCE)
+  set(${TESTVAR}_INT_CHECK ${${TESTVAR}} CACHE INTERNAL "x" FORCE)
 endmacro(clear_if_changed)

 # Try to get some hints from pkg-config, if available
--- a/cmake-modules/HunterGate.cmake
+++ b/cmake-modules/HunterGate.cmake
@ -22,9 +22,38 @@
 # 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 is a gate file to Hunter package manager.
+# Include this file using `include` command and add package you need, example:
+#
+#     cmake_minimum_required(VERSION 3.2)
+#
+#     include("cmake/HunterGate.cmake")
+#     HunterGate(
+#         URL "https://github.com/path/to/hunter/archive.tar.gz"
+#         SHA1 "798501e983f14b28b10cda16afa4de69eee1da1d"
+#     )
+#
+#     project(MyProject)
+#
+#     hunter_add_package(Foo)
+#     hunter_add_package(Boo COMPONENTS Bar Baz)
+#
+# Projects:
+#     * https://github.com/hunter-packages/gate/
+#     * https://github.com/ruslo/hunter

 option(HUNTER_ENABLED "Enable Hunter package manager support" ON)

+if(HUNTER_ENABLED)
+  if(CMAKE_VERSION VERSION_LESS "3.2")
+    message(
+        FATAL_ERROR
+        "At least CMake version 3.2 required for Hunter dependency management."
+        " Update CMake or set HUNTER_ENABLED to OFF."
+    )
+  endif()
+endif()
+
 include(CMakeParseArguments) # cmake_parse_arguments

 option(HUNTER_STATUS_PRINT "Print working status" ON)
--- a/code/AssetLib/3DS/3DSConverter.cpp
+++ b/code/AssetLib/3DS/3DSConverter.cpp
@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -52,9 +52,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <cctype>
 #include <memory>

-namespace Assimp {
+using namespace Assimp;

-static constexpr unsigned int NotSet = 0xcdcdcdcd;
+static const unsigned int NotSet = 0xcdcdcdcd;

 // ------------------------------------------------------------------------------------------------
 // Setup final material indices, generae a default material if necessary
@ -68,7 +68,7 @@ void Discreet3DSImporter::ReplaceDefaultMaterial() {
    unsigned int idx(NotSet);
    for (unsigned int i = 0; i < mScene->mMaterials.size(); ++i) {
        std::string s = mScene->mMaterials[i].mName;
-        for (char &it : s) {
+        for (char & it : s) {
            it = static_cast<char>(::tolower(static_cast<unsigned char>(it)));
        }

@ -262,8 +262,7 @@ void Discreet3DSImporter::ConvertMaterial(D3DS::Material &oldMat,
        unsigned int iWire = 1;
        mat.AddProperty<int>((int *)&iWire, 1, AI_MATKEY_ENABLE_WIREFRAME);
    }
-        [[fallthrough]];
-
+// fallthrough
    case D3DS::Discreet3DS::Gouraud:
        eShading = aiShadingMode_Gouraud;
        break;
@ -593,7 +592,7 @@ void Discreet3DSImporter::AddNodeToGraph(aiScene *pcSOut, aiNode *pcOut,

        // Cameras or lights define their transformation in their parent node and in the
        // corresponding light or camera chunks. However, we read and process the latter
-        // to be able to return valid cameras/lights even if no scenegraph is given.
+        // to to be able to return valid cameras/lights even if no scenegraph is given.
        for (unsigned int n = 0; n < pcSOut->mNumCameras; ++n) {
            if (pcSOut->mCameras[n]->mName == pcOut->mName) {
                pcSOut->mCameras[n]->mLookAt = aiVector3D(0.f, 0.f, 1.f);
@ -643,17 +642,11 @@ void Discreet3DSImporter::AddNodeToGraph(aiScene *pcSOut, aiNode *pcOut,
    }

    // Allocate storage for children
-    const unsigned int size = static_cast<unsigned int>(pcIn->mChildren.size());
-
-    pcOut->mNumChildren = size;
-    if (size == 0) {
-        return;
-    }
-
+    pcOut->mNumChildren = (unsigned int)pcIn->mChildren.size();
    pcOut->mChildren = new aiNode *[pcIn->mChildren.size()];

    // Recursively process all children
-    
+    const unsigned int size = static_cast<unsigned int>(pcIn->mChildren.size());
    for (unsigned int i = 0; i < size; ++i) {
        pcOut->mChildren[i] = new aiNode();
        pcOut->mChildren[i]->mParent = pcOut;
@ -715,7 +708,7 @@ void Discreet3DSImporter::GenerateNodeGraph(aiScene *pcOut) {
            pcNode->mNumMeshes = 1;

            // Build a name for the node
-            pcNode->mName.length = ai_snprintf(pcNode->mName.data, AI_MAXLEN, "3DSMesh_%u", i);
+            pcNode->mName.length = ai_snprintf(pcNode->mName.data, MAXLEN, "3DSMesh_%u", i);
        }

        // Build dummy nodes for all cameras
@ -811,6 +804,4 @@ void Discreet3DSImporter::ConvertScene(aiScene *pcOut) {
    }
 }

-} // namespace Assimp
-
 #endif // !! ASSIMP_BUILD_NO_3DS_IMPORTER
--- a/code/AssetLib/3DS/3DSExporter.cpp
+++ b/code/AssetLib/3DS/3DSExporter.cpp
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team


 All rights reserved.
@ -52,7 +52,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/StringComparison.h>
 #include <assimp/DefaultLogger.hpp>
 #include <assimp/Exporter.hpp>
-#include <assimp/Exceptional.h>
 #include <assimp/IOSystem.hpp>

 #include <memory>
@ -210,7 +209,9 @@ Discreet3DSExporter::Discreet3DSExporter(std::shared_ptr<IOStream> &outfile, con
 }

 // ------------------------------------------------------------------------------------------------
-Discreet3DSExporter::~Discreet3DSExporter() = default;
+Discreet3DSExporter::~Discreet3DSExporter() {
+    // empty
+}

 // ------------------------------------------------------------------------------------------------
 int Discreet3DSExporter::WriteHierarchy(const aiNode &node, int seq, int sibling_level) {
--- a/code/AssetLib/3DS/3DSExporter.h
+++ b/code/AssetLib/3DS/3DSExporter.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team
+

 All rights reserved.

@ -56,7 +57,8 @@ struct aiNode;
 struct aiMaterial;
 struct aiMesh;

-namespace Assimp {
+namespace Assimp
+{

 // ------------------------------------------------------------------------------------------------
 /**
@ -86,7 +88,7 @@ private:

    std::map<const aiNode*, aiMatrix4x4> trafos;

-    using MeshesByNodeMap = std::multimap<const aiNode*, unsigned int>;
+    typedef std::multimap<const aiNode*, unsigned int> MeshesByNodeMap;
    MeshesByNodeMap meshes;

 };
--- a/code/AssetLib/3DS/3DSHelper.h
+++ b/code/AssetLib/3DS/3DSHelper.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team


 All rights reserved.
@ -322,6 +322,7 @@ struct Texture {
    //! Default constructor
    Texture() AI_NO_EXCEPT
            : mTextureBlend(0.0f),
+              mMapName(),
              mOffsetU(0.0),
              mOffsetV(0.0),
              mScaleU(1.0),
@ -333,11 +334,51 @@ struct Texture {
        mTextureBlend = get_qnan();
    }

-    Texture(const Texture &other) = default;
+    Texture(const Texture &other) :
+            mTextureBlend(other.mTextureBlend),
+            mMapName(other.mMapName),
+            mOffsetU(other.mOffsetU),
+            mOffsetV(other.mOffsetV),
+            mScaleU(other.mScaleU),
+            mScaleV(other.mScaleV),
+            mRotation(other.mRotation),
+            mMapMode(other.mMapMode),
+            bPrivate(other.bPrivate),
+            iUVSrc(other.iUVSrc) {
+        // empty
+    }

-    Texture(Texture &&other) AI_NO_EXCEPT = default;
+    Texture(Texture &&other) AI_NO_EXCEPT : mTextureBlend(other.mTextureBlend),
+                                            mMapName(std::move(other.mMapName)),
+                                            mOffsetU(other.mOffsetU),
+                                            mOffsetV(other.mOffsetV),
+                                            mScaleU(other.mScaleU),
+                                            mScaleV(other.mScaleV),
+                                            mRotation(other.mRotation),
+                                            mMapMode(other.mMapMode),
+                                            bPrivate(other.bPrivate),
+                                            iUVSrc(other.iUVSrc) {
+        // empty
+    }

-    Texture &operator=(Texture &&other) AI_NO_EXCEPT = default;
+    Texture &operator=(Texture &&other) AI_NO_EXCEPT {
+        if (this == &other) {
+            return *this;
+        }
+
+        mTextureBlend = other.mTextureBlend;
+        mMapName = std::move(other.mMapName);
+        mOffsetU = other.mOffsetU;
+        mOffsetV = other.mOffsetV;
+        mScaleU = other.mScaleU;
+        mScaleV = other.mScaleV;
+        mRotation = other.mRotation;
+        mMapMode = other.mMapMode;
+        bPrivate = other.bPrivate;
+        iUVSrc = other.iUVSrc;
+
+        return *this;
+    }

    //! Specifies the blend factor for the texture
    ai_real mTextureBlend;
@ -365,13 +406,14 @@ struct Texture {
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif // _MSC_VER
+
 // ---------------------------------------------------------------------------
 /** Helper structure representing a 3ds material */
 struct Material {
    //! Default constructor has been deleted
    Material() :
            mName(),
-            mDiffuse(0.6f, 0.6f, 0.6f),
+            mDiffuse(ai_real(0.6), ai_real(0.6), ai_real(0.6)),
            mSpecularExponent(ai_real(0.0)),
            mShininessStrength(ai_real(1.0)),
            mShading(Discreet3DS::Gouraud),
@ -384,7 +426,7 @@ struct Material {
    //! Constructor with explicit name
    explicit Material(const std::string &name) :
            mName(name),
-            mDiffuse(0.6f, 0.6f, 0.6f),
+            mDiffuse(ai_real(0.6), ai_real(0.6), ai_real(0.6)),
            mSpecularExponent(ai_real(0.0)),
            mShininessStrength(ai_real(1.0)),
            mShading(Discreet3DS::Gouraud),
@ -394,9 +436,83 @@ struct Material {
        // empty
    }

-    Material(const Material &other) = default;
+    Material(const Material &other) :
+            mName(other.mName),
+            mDiffuse(other.mDiffuse),
+            mSpecularExponent(other.mSpecularExponent),
+            mShininessStrength(other.mShininessStrength),
+            mSpecular(other.mSpecular),
+            mAmbient(other.mAmbient),
+            mShading(other.mShading),
+            mTransparency(other.mTransparency),
+            sTexDiffuse(other.sTexDiffuse),
+            sTexOpacity(other.sTexOpacity),
+            sTexSpecular(other.sTexSpecular),
+            sTexReflective(other.sTexReflective),
+            sTexBump(other.sTexBump),
+            sTexEmissive(other.sTexEmissive),
+            sTexShininess(other.sTexShininess),
+            mBumpHeight(other.mBumpHeight),
+            mEmissive(other.mEmissive),
+            sTexAmbient(other.sTexAmbient),
+            mTwoSided(other.mTwoSided) {
+        // empty
+    }

-    virtual ~Material() = default;
+    //! Move constructor. This is explicitly written because MSVC doesn't support defaulting it
+    Material(Material &&other) AI_NO_EXCEPT : mName(std::move(other.mName)),
+                                              mDiffuse(other.mDiffuse),
+                                              mSpecularExponent(other.mSpecularExponent),
+                                              mShininessStrength(other.mShininessStrength),
+                                              mSpecular(other.mSpecular),
+                                              mAmbient(other.mAmbient),
+                                              mShading(other.mShading),
+                                              mTransparency(other.mTransparency),
+                                              sTexDiffuse(std::move(other.sTexDiffuse)),
+                                              sTexOpacity(std::move(other.sTexOpacity)),
+                                              sTexSpecular(std::move(other.sTexSpecular)),
+                                              sTexReflective(std::move(other.sTexReflective)),
+                                              sTexBump(std::move(other.sTexBump)),
+                                              sTexEmissive(std::move(other.sTexEmissive)),
+                                              sTexShininess(std::move(other.sTexShininess)),
+                                              mBumpHeight(other.mBumpHeight),
+                                              mEmissive(other.mEmissive),
+                                              sTexAmbient(std::move(other.sTexAmbient)),
+                                              mTwoSided(other.mTwoSided) {
+        // empty
+    }
+
+    Material &operator=(Material &&other) AI_NO_EXCEPT {
+        if (this == &other) {
+            return *this;
+        }
+
+        mName = std::move(other.mName);
+        mDiffuse = other.mDiffuse;
+        mSpecularExponent = other.mSpecularExponent;
+        mShininessStrength = other.mShininessStrength,
+        mSpecular = other.mSpecular;
+        mAmbient = other.mAmbient;
+        mShading = other.mShading;
+        mTransparency = other.mTransparency;
+        sTexDiffuse = std::move(other.sTexDiffuse);
+        sTexOpacity = std::move(other.sTexOpacity);
+        sTexSpecular = std::move(other.sTexSpecular);
+        sTexReflective = std::move(other.sTexReflective);
+        sTexBump = std::move(other.sTexBump);
+        sTexEmissive = std::move(other.sTexEmissive);
+        sTexShininess = std::move(other.sTexShininess);
+        mBumpHeight = other.mBumpHeight;
+        mEmissive = other.mEmissive;
+        sTexAmbient = std::move(other.sTexAmbient);
+        mTwoSided = other.mTwoSided;
+
+        return *this;
+    }
+
+    virtual ~Material() {
+        // empty
+    }

    //! Name of the material
    std::string mName;
--- a/code/AssetLib/3DS/3DSLoader.cpp
+++ b/code/AssetLib/3DS/3DSLoader.cpp
@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -54,9 +54,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/DefaultLogger.hpp>
 #include <assimp/IOSystem.hpp>

-namespace Assimp {
+using namespace Assimp;

-static constexpr aiImporterDesc desc = {
+static const aiImporterDesc desc = {
    "Discreet 3DS Importer",
    "",
    "",
@ -103,6 +103,12 @@ Discreet3DSImporter::Discreet3DSImporter() :
    // empty
 }

+// ------------------------------------------------------------------------------------------------
+// Destructor, private as well
+Discreet3DSImporter::~Discreet3DSImporter() {
+    // empty
+}
+
 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
 bool Discreet3DSImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /*checkSig*/) const {
@ -262,15 +268,8 @@ void Discreet3DSImporter::ParseMainChunk() {
    };

    ASSIMP_3DS_END_CHUNK();
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunreachable-code-return"
-#endif
    // recursively continue processing this hierarchy level
    return ParseMainChunk();
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
 }

 // ------------------------------------------------------------------------------------------------
@ -320,7 +319,7 @@ void Discreet3DSImporter::ParseObjectChunk() {
    case Discreet3DS::CHUNK_MAT_MATERIAL:

        // Add a new material to the list
-        mScene->mMaterials.emplace_back(std::string("UNNAMED_" + ai_to_string(mScene->mMaterials.size())));
+        mScene->mMaterials.push_back(D3DS::Material(std::string("UNNAMED_" + ai_to_string(mScene->mMaterials.size()))));
        ParseMaterialChunk();
        break;

@ -365,13 +364,13 @@ void Discreet3DSImporter::ParseChunk(const char *name, unsigned int num) {
    // IMPLEMENTATION NOTE;
    // Cameras or lights define their transformation in their parent node and in the
    // corresponding light or camera chunks. However, we read and process the latter
-    // to be able to return valid cameras/lights even if no scenegraph is given.
+    // to to be able to return valid cameras/lights even if no scenegraph is given.

    // get chunk type
    switch (chunk.Flag) {
    case Discreet3DS::CHUNK_TRIMESH: {
        // this starts a new triangle mesh
-        mScene->mMeshes.emplace_back(std::string(name, num));
+        mScene->mMeshes.push_back(D3DS::Mesh(std::string(name, num)));

        // Read mesh chunks
        ParseMeshChunk();
@ -1000,7 +999,7 @@ void Discreet3DSImporter::ParseMeshChunk() {
        mMesh.mFaces.reserve(num);
        while (num-- > 0) {
            // 3DS faces are ALWAYS triangles
-            mMesh.mFaces.emplace_back();
+            mMesh.mFaces.push_back(D3DS::Face());
            D3DS::Face &sFace = mMesh.mFaces.back();

            sFace.mIndices[0] = (uint16_t)stream->GetI2();
@ -1335,6 +1334,4 @@ void Discreet3DSImporter::ParseColorChunk(aiColor3D *out, bool acceptPercent) {
    (void)bGamma;
 }

-} // namespace Assimp
-
 #endif // !! ASSIMP_BUILD_NO_3DS_IMPORTER
--- a/code/AssetLib/3DS/3DSLoader.h
+++ b/code/AssetLib/3DS/3DSLoader.h
@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team


 All rights reserved.
@ -59,6 +59,7 @@ struct aiNode;

 namespace Assimp    {

+
 using namespace D3DS;

 // ---------------------------------------------------------------------------------
@ -67,7 +68,7 @@ using namespace D3DS;
 class Discreet3DSImporter : public BaseImporter {
 public:
    Discreet3DSImporter();
-    ~Discreet3DSImporter() override = default;
+    ~Discreet3DSImporter();

    // -------------------------------------------------------------------
    /** Returns whether the class can handle the format of the given file.
--- a/code/AssetLib/3MF/3MFTypes.h
+++ b/code/AssetLib/3MF/3MFTypes.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -57,7 +57,6 @@ enum class ResourceType {
    RT_BaseMaterials,
    RT_EmbeddedTexture2D,
    RT_Texture2DGroup,
-    RT_ColorGroup,
    RT_Unknown
 }; // To be extended with other resource types (eg. material extension resources like Texture2d, Texture2dGroup...)

@ -70,7 +69,9 @@ public:
        // empty
    }

-    virtual ~Resource() = default;
+    virtual ~Resource() {
+        // empty
+    }

    virtual ResourceType getType() const {
        return ResourceType::RT_Unknown;
@ -94,7 +95,7 @@ public:
        // empty
    }

-    ~EmbeddedTexture() override = default;
+    ~EmbeddedTexture() = default;

    ResourceType getType() const override {
        return ResourceType::RT_EmbeddedTexture2D;
@ -111,28 +112,13 @@ public:
        // empty
    }

-    ~Texture2DGroup() override = default;
+    ~Texture2DGroup() = default;

    ResourceType getType() const override {
        return ResourceType::RT_Texture2DGroup;
    }
 };

-class ColorGroup : public Resource {
-public:
-    std::vector<aiColor4D> mColors;
-    ColorGroup(int id) :
-            Resource(id){
-        // empty
-    }
-
-    ~ColorGroup() override = default;
-
-    ResourceType getType() const override {
-        return ResourceType::RT_ColorGroup;
-    }
-};
-
 class BaseMaterials : public Resource {
 public:
    std::vector<unsigned int> mMaterialIndex;
@ -143,7 +129,7 @@ public:
        // empty
    }

-    ~BaseMaterials() override = default;
+    ~BaseMaterials() = default;

    ResourceType getType() const override {
        return ResourceType::RT_BaseMaterials;
@ -168,7 +154,7 @@ public:
        // empty
    }

-    ~Object() override = default;
+    ~Object() = default;

    ResourceType getType() const override {
        return ResourceType::RT_Object;
--- a/code/AssetLib/3MF/3MFXmlTags.h
+++ b/code/AssetLib/3MF/3MFXmlTags.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -98,11 +98,6 @@ namespace XmlTag {
    const char *const texture_cuurd_u = "u";
    const char *const texture_cuurd_v = "v";

-    // vertex color definitions
-    const char *const colorgroup = "m:colorgroup";
-    const char *const color_item = "m:color";
-    const char *const color_vaule = "color";
-
    // Meta info tags
    const char* const CONTENT_TYPES_ARCHIVE = "[Content_Types].xml";
    const char* const ROOT_RELATIONSHIPS_ARCHIVE = "_rels/.rels";
--- a/code/AssetLib/3MF/D3MFExporter.cpp
+++ b/code/AssetLib/3MF/D3MFExporter.cpp
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -83,7 +83,7 @@ void ExportScene3MF(const char *pFile, IOSystem *pIOSystem, const aiScene *pScen
 namespace D3MF {

 D3MFExporter::D3MFExporter(const char *pFile, const aiScene *pScene) :
-        mArchiveName(pFile), m_zipArchive(nullptr), mScene(pScene) {
+        mArchiveName(pFile), m_zipArchive(nullptr), mScene(pScene), mModelOutput(), mRelOutput(), mContentOutput(), mBuildItems(), mRelations() {
    // empty
 }

@ -249,10 +249,10 @@ void D3MFExporter::writeBaseMaterials() {
            if (color.r <= 1 && color.g <= 1 && color.b <= 1 && color.a <= 1) {

                hexDiffuseColor = ai_rgba2hex(
-                        (int)(((ai_real)color.r) * 255),
-                        (int)(((ai_real)color.g) * 255),
-                        (int)(((ai_real)color.b) * 255),
-                        (int)(((ai_real)color.a) * 255),
+                        (int)((ai_real)color.r) * 255,
+                        (int)((ai_real)color.g) * 255,
+                        (int)((ai_real)color.b) * 255,
+                        (int)((ai_real)color.a) * 255,
                        true);

            } else {
--- a/code/AssetLib/3MF/D3MFExporter.h
+++ b/code/AssetLib/3MF/D3MFExporter.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

--- a/code/AssetLib/3MF/D3MFImporter.cpp
+++ b/code/AssetLib/3MF/D3MFImporter.cpp
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -68,7 +68,7 @@ namespace Assimp {

 using namespace D3MF;

-static constexpr aiImporterDesc desc = {
+static const aiImporterDesc desc = {
    "3mf Importer",
    "",
    "",
@ -81,17 +81,21 @@ static constexpr aiImporterDesc desc = {
    "3mf"
 };

-bool D3MFImporter::CanRead(const std::string &filename, IOSystem *pIOHandler, bool ) const {
+D3MFImporter::D3MFImporter() :
+        BaseImporter() {
+    // empty
+}
+
+D3MFImporter::~D3MFImporter() {
+    // empty
+}
+
+bool D3MFImporter::CanRead(const std::string &filename, IOSystem *pIOHandler, bool /*checkSig*/) const {
    if (!ZipArchiveIOSystem::isZipArchive(pIOHandler, filename)) {
        return false;
    }
-    static const char *const ModelRef = "3D/3dmodel.model";
-    ZipArchiveIOSystem archive(pIOHandler, filename);
-    if (!archive.Exists(ModelRef)) {
-        return false;
-    }
-
-    return true;
+    D3MF::D3MFOpcPackage opcPackage(pIOHandler, filename);
+    return opcPackage.validate();
 }

 void D3MFImporter::SetupProperties(const Importer*) {
--- a/code/AssetLib/3MF/D3MFImporter.h
+++ b/code/AssetLib/3MF/D3MFImporter.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -56,10 +56,10 @@ namespace Assimp {
 class D3MFImporter : public BaseImporter {
 public:
    /// @brief The default class constructor.
-    D3MFImporter() = default;
+    D3MFImporter();

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

    /// @brief Performs the data format detection.
    /// @param pFile        The filename to check.
--- a/code/AssetLib/3MF/D3MFOpcPackage.cpp
+++ b/code/AssetLib/3MF/D3MFOpcPackage.cpp
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -68,7 +68,7 @@ using OpcPackageRelationshipPtr = std::shared_ptr<OpcPackageRelationship>;
 class OpcPackageRelationshipReader {
 public:
    OpcPackageRelationshipReader(XmlParser &parser) :
-            mRelations() {
+            m_relationShips() {
        XmlNode root = parser.getRootNode();
        ParseRootNode(root);
    }
@ -108,20 +108,20 @@ public:
                relPtr->type = currentNode.attribute(XmlTag::RELS_ATTRIB_TYPE).as_string();
                relPtr->target = currentNode.attribute(XmlTag::RELS_ATTRIB_TARGET).as_string();
                if (validateRels(relPtr)) {
-                    mRelations.push_back(relPtr);
+                    m_relationShips.push_back(relPtr);
                }
            }
        }
    }

-    std::vector<OpcPackageRelationshipPtr> mRelations;
+    std::vector<OpcPackageRelationshipPtr> m_relationShips;
 };

 static bool IsEmbeddedTexture( const std::string &filename ) {
    const std::string extension = BaseImporter::GetExtension(filename);
-    if (extension == "jpg" || extension == "png" || extension == "jpeg") {
+    if (extension == "jpg" || extension == "png") {
        std::string::size_type pos = filename.find("thumbnail");
-        if (pos != std::string::npos) {
+        if (pos == std::string::npos) {
            return false;
        }
        return true;
@ -160,7 +160,7 @@ D3MFOpcPackage::D3MFOpcPackage(IOSystem *pIOHandler, const std::string &rFile) :
                    // deal with zip-bug
                    rootFile = rootFile.substr(1);
                }
-            }
+            } 

            ASSIMP_LOG_VERBOSE_DEBUG(rootFile);

@ -186,6 +186,9 @@ D3MFOpcPackage::D3MFOpcPackage(IOSystem *pIOHandler, const std::string &rFile) :
 D3MFOpcPackage::~D3MFOpcPackage() {
    mZipArchive->Close(mRootStream);
    delete mZipArchive;
+    for (auto tex : mEmbeddedTextures) {
+        delete tex;
+    }
 }

 IOStream *D3MFOpcPackage::RootStream() const {
@ -214,11 +217,11 @@ std::string D3MFOpcPackage::ReadPackageRootRelationship(IOStream *stream) {

    OpcPackageRelationshipReader reader(xmlParser);

-    auto itr = std::find_if(reader.mRelations.begin(), reader.mRelations.end(), [](const OpcPackageRelationshipPtr &rel) {
+    auto itr = std::find_if(reader.m_relationShips.begin(), reader.m_relationShips.end(), [](const OpcPackageRelationshipPtr &rel) {
        return rel->type == XmlTag::PACKAGE_START_PART_RELATIONSHIP_TYPE;
    });

-    if (itr == reader.mRelations.end()) {
+    if (itr == reader.m_relationShips.end()) {
        throw DeadlyImportError("Cannot find ", XmlTag::PACKAGE_START_PART_RELATIONSHIP_TYPE);
    }

--- a/code/AssetLib/3MF/D3MFOpcPackage.h
+++ b/code/AssetLib/3MF/D3MFOpcPackage.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

--- a/code/AssetLib/3MF/XmlSerializer.cpp
+++ b/code/AssetLib/3MF/XmlSerializer.cpp
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -44,21 +44,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "3MFTypes.h"
 #include <assimp/scene.h>

-#include <utility>
-
 namespace Assimp {
 namespace D3MF {

-static constexpr int IdNotSet = -1;
+static const int IdNotSet = -1;

 namespace {

-static constexpr size_t ColRGBA_Len = 9;
-static constexpr size_t ColRGB_Len = 7;
+static const size_t ColRGBA_Len = 9;
+static const size_t ColRGB_Len = 7;

 // format of the color string: #RRGGBBAA or #RRGGBB (3MF Core chapter 5.1.1)
-bool validateColorString(const std::string color) {
-    const size_t len = color.size();
+bool validateColorString(const char *color) {
+    const size_t len = strlen(color);
    if (ColRGBA_Len != len && ColRGB_Len != len) {
        return false;
    }
@ -75,7 +73,7 @@ aiFace ReadTriangle(XmlNode &node, int &texId0, int &texId1, int &texId2) {
    face.mIndices[1] = static_cast<unsigned int>(std::atoi(node.attribute(XmlTag::v2).as_string()));
    face.mIndices[2] = static_cast<unsigned int>(std::atoi(node.attribute(XmlTag::v3).as_string()));

-    texId0 = texId1 = texId2 = IdNotSet;
+    texId0 = texId1 = texId2 = -1;
    XmlParser::getIntAttribute(node, XmlTag::p1, texId0);
    XmlParser::getIntAttribute(node, XmlTag::p2, texId1);
    XmlParser::getIntAttribute(node, XmlTag::p3, texId2);
@ -157,8 +155,8 @@ aiMatrix4x4 parseTransformMatrix(const std::string& matrixStr) {
    return transformMatrix;
 }

-bool parseColor(const std::string &color, aiColor4D &diffuse) {
-    if (color.empty()) {
+bool parseColor(const char *color, aiColor4D &diffuse) {
+    if (nullptr == color) {
        return false;
    }

@ -178,7 +176,7 @@ bool parseColor(const std::string &color, aiColor4D &diffuse) {

    char b[3] = { color[5], color[6], '\0' };
    diffuse.b = static_cast<ai_real>(strtol(b, nullptr, 16)) / ai_real(255.0);
-    const size_t len = color.size();
+    const size_t len = strlen(color);
    if (ColRGB_Len == len) {
        return true;
    }
@ -216,7 +214,7 @@ void XmlSerializer::ImportXml(aiScene *scene) {
    if (nullptr == scene) {
        return;
    }
-
+    
    scene->mRootNode = new aiNode(XmlTag::RootTag);
    XmlNode node = mXmlParser->getRootNode().child(XmlTag::model);
    if (node.empty()) {
@ -236,8 +234,6 @@ void XmlSerializer::ImportXml(aiScene *scene) {
            ReadBaseMaterials(currentNode);
        } else if (currentNodeName == XmlTag::meta) {
            ReadMetadata(currentNode);
-        } else if (currentNodeName == XmlTag::colorgroup) {
-            ReadColorGroup(currentNode);
        }
    }
    StoreMaterialsInScene(scene);
@ -333,49 +329,9 @@ void XmlSerializer::ReadObject(XmlNode &node) {

            if (hasPid) {
                auto it = mResourcesDictionnary.find(pid);
-                if (hasPindex && it != mResourcesDictionnary.end()) {
-                    if (it->second->getType() == ResourceType::RT_BaseMaterials) {
-                        BaseMaterials *materials = static_cast<BaseMaterials *>(it->second);
-                        mesh->mMaterialIndex = materials->mMaterialIndex[pindex];
-                    } else if (it->second->getType() == ResourceType::RT_Texture2DGroup) {
-                        Texture2DGroup *group = static_cast<Texture2DGroup *>(it->second);
-                        if (mesh->mTextureCoords[0] == nullptr) {
-                            mesh->mNumUVComponents[0] = 2;
-                            for (unsigned int i = 1; i < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++i) {
-                                mesh->mNumUVComponents[i] = 0;
-                            }
-
-                            const std::string name = ai_to_string(group->mTexId);
-                            for (size_t i = 0; i < mMaterials.size(); ++i) {
-                                if (name == mMaterials[i]->GetName().C_Str()) {
-                                    mesh->mMaterialIndex = static_cast<unsigned int>(i);
-                                }
-                            }
-
-                            mesh->mTextureCoords[0] = new aiVector3D[mesh->mNumVertices];
-                            for (unsigned int vertex_idx = 0; vertex_idx < mesh->mNumVertices; vertex_idx++) {
-                                mesh->mTextureCoords[0][vertex_idx] =
-                                        aiVector3D(group->mTex2dCoords[pindex].x, group->mTex2dCoords[pindex].y, 0.0f);
-                            }
-                        } else {
-                            for (unsigned int vertex_idx = 0; vertex_idx < mesh->mNumVertices; vertex_idx++) {
-                                if (mesh->mTextureCoords[0][vertex_idx].z < 0) {
-                                    // use default
-                                    mesh->mTextureCoords[0][vertex_idx] =
-                                            aiVector3D(group->mTex2dCoords[pindex].x, group->mTex2dCoords[pindex].y, 0.0f);
-                                }
-                            }
-                        }
-                    }else if (it->second->getType() == ResourceType::RT_ColorGroup) {
-                        if (mesh->mColors[0] == nullptr) {
-                            mesh->mColors[0] = new aiColor4D[mesh->mNumVertices];
-
-                            ColorGroup *group = static_cast<ColorGroup *>(it->second);
-                            for (unsigned int vertex_idx = 0; vertex_idx < mesh->mNumVertices; vertex_idx++) {
-                                mesh->mColors[0][vertex_idx] = group->mColors[pindex];
-                            }
-                        }
-                    }
+                if (hasPindex && it != mResourcesDictionnary.end() && it->second->getType() == ResourceType::RT_BaseMaterials) {
+                    BaseMaterials *materials = static_cast<BaseMaterials *>(it->second);
+                    mesh->mMaterialIndex = materials->mMaterialIndex[pindex];
                }
            }

@ -457,36 +413,27 @@ void XmlSerializer::ImportTriangles(XmlNode &node, aiMesh *mesh) {
    for (XmlNode &currentNode : node.children()) {
        const std::string currentName = currentNode.name();
        if (currentName == XmlTag::triangle) {
-            int pid = IdNotSet;
+            int pid = IdNotSet, p1 = IdNotSet;
            bool hasPid = getNodeAttribute(currentNode, D3MF::XmlTag::pid, pid);
+            bool hasP1 = getNodeAttribute(currentNode, D3MF::XmlTag::p1, p1);

-            int pindex[3];
-            aiFace face = ReadTriangle(currentNode, pindex[0], pindex[1], pindex[2]);
-            if (hasPid && (pindex[0] != IdNotSet || pindex[1] != IdNotSet || pindex[2] != IdNotSet)) {
+            int texId[3];
+            Texture2DGroup *group = nullptr;
+            aiFace face = ReadTriangle(currentNode, texId[0], texId[1], texId[2]);
+            if (hasPid && hasP1) {
                auto it = mResourcesDictionnary.find(pid);
                if (it != mResourcesDictionnary.end()) {
                    if (it->second->getType() == ResourceType::RT_BaseMaterials) {
                        BaseMaterials *baseMaterials = static_cast<BaseMaterials *>(it->second);
-
-                        auto update_material = [&](int idx) {
-                            if (pindex[idx] != IdNotSet) {
-                                mesh->mMaterialIndex = baseMaterials->mMaterialIndex[pindex[idx]];
-                            }
-                        };
-
-                        update_material(0);
-                        update_material(1);
-                        update_material(2);
-
+                        mesh->mMaterialIndex = baseMaterials->mMaterialIndex[p1];
                    } else if (it->second->getType() == ResourceType::RT_Texture2DGroup) {
-                        // Load texture coordinates into mesh, when any
-                        Texture2DGroup *group = static_cast<Texture2DGroup *>(it->second); // fix bug
                        if (mesh->mTextureCoords[0] == nullptr) {
                            mesh->mNumUVComponents[0] = 2;
                            for (unsigned int i = 1; i < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++i) {
                                mesh->mNumUVComponents[i] = 0;
                            }

+                            group = static_cast<Texture2DGroup *>(it->second);
                            const std::string name = ai_to_string(group->mTexId);
                            for (size_t i = 0; i < mMaterials.size(); ++i) {
                                if (name == mMaterials[i]->GetName().C_Str()) {
@ -494,44 +441,21 @@ void XmlSerializer::ImportTriangles(XmlNode &node, aiMesh *mesh) {
                                }
                            }
                            mesh->mTextureCoords[0] = new aiVector3D[mesh->mNumVertices];
-                            for (unsigned int vertex_index = 0; vertex_index < mesh->mNumVertices; vertex_index++) {
-                                mesh->mTextureCoords[0][vertex_index].z = IdNotSet;//mark not set
-                            }
                        }
-
-                        auto update_texture = [&](int idx) {
-                            if (pindex[idx] != IdNotSet) {
-                                size_t vertex_index = face.mIndices[idx];
-                                mesh->mTextureCoords[0][vertex_index] =
-                                        aiVector3D(group->mTex2dCoords[pindex[idx]].x, group->mTex2dCoords[pindex[idx]].y, 0.0f);
-                            }
-                        };
-
-                        update_texture(0);
-                        update_texture(1);
-                        update_texture(2);
-
-                    } else if (it->second->getType() == ResourceType::RT_ColorGroup) {
-                        // Load vertex color into mesh, when any
-                        ColorGroup *group = static_cast<ColorGroup *>(it->second);
-                        if (mesh->mColors[0] == nullptr) {
-                            mesh->mColors[0] = new aiColor4D[mesh->mNumVertices];
-                        }
-
-                        auto update_color = [&](int idx) {
-                            if (pindex[idx] != IdNotSet) {
-                                size_t vertex_index = face.mIndices[idx];
-                                mesh->mColors[0][vertex_index] = group->mColors[pindex[idx]];
-                            }
-                        };
-
-                        update_color(0);
-                        update_color(1);
-                        update_color(2);
-                    }
+                    } 
                }
            }

+            // Load texture coordinates into mesh, when any
+            if (group != nullptr) {
+                size_t i0 = face.mIndices[0];
+                size_t i1 = face.mIndices[1];
+                size_t i2 = face.mIndices[2];
+                mesh->mTextureCoords[0][i0] = aiVector3D(group->mTex2dCoords[texId[0]].x, group->mTex2dCoords[texId[0]].y, 0.0f);
+                mesh->mTextureCoords[0][i1] = aiVector3D(group->mTex2dCoords[texId[1]].x, group->mTex2dCoords[texId[1]].y, 0.0f);
+                mesh->mTextureCoords[0][i2] = aiVector3D(group->mTex2dCoords[texId[2]].x, group->mTex2dCoords[texId[2]].y, 0.0f);
+            }
+
            faces.push_back(face);
        }
    }
@ -658,7 +582,7 @@ aiMaterial *XmlSerializer::readMaterialDef(XmlNode &node, unsigned int basemater
    stdMaterialName += strId;
    stdMaterialName += "_";
    if (hasName) {
-        stdMaterialName += name;
+        stdMaterialName += std::string(name);
    } else {
        stdMaterialName += "basemat_";
        stdMaterialName += ai_to_string(mMaterials.size());
@ -672,38 +596,6 @@ aiMaterial *XmlSerializer::readMaterialDef(XmlNode &node, unsigned int basemater
    return material;
 }

-void XmlSerializer::ReadColor(XmlNode &node, ColorGroup *colorGroup) {
-    if (node.empty() || nullptr == colorGroup) {
-        return;
-    }
-
-    for (XmlNode currentNode : node.children()) {
-        const std::string currentName = currentNode.name();
-        if (currentName == XmlTag::color_item) {
-            const char *color = currentNode.attribute(XmlTag::color_vaule).as_string();
-            aiColor4D color_value;
-            if (parseColor(color, color_value)) {
-                colorGroup->mColors.push_back(color_value);
-            }
-        }
-    }
-}
-
-void XmlSerializer::ReadColorGroup(XmlNode &node) {
-    if (node.empty()) {
-        return;
-    }
-
-    int id = IdNotSet;
-    if (!XmlParser::getIntAttribute(node, XmlTag::id, id)) {
-        return;
-    }
-
-    ColorGroup *group = new ColorGroup(id);
-    ReadColor(node, group);
-    mResourcesDictionnary.insert(std::make_pair(id, group));
-}
-
 void XmlSerializer::StoreMaterialsInScene(aiScene *scene) {
    if (nullptr == scene) {
        return;
--- a/code/AssetLib/3MF/XmlSerializer.h
+++ b/code/AssetLib/3MF/XmlSerializer.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -57,7 +57,6 @@ class D3MFOpcPackage;
 class Object;
 class Texture2DGroup;
 class EmbeddedTexture;
-class ColorGroup;

 class XmlSerializer {
 public:
@ -79,8 +78,6 @@ private:
    void ReadTextureGroup(XmlNode &node);
    aiMaterial *readMaterialDef(XmlNode &node, unsigned int basematerialsId);
    void StoreMaterialsInScene(aiScene *scene);
-    void ReadColorGroup(XmlNode &node);
-    void ReadColor(XmlNode &node, ColorGroup *colorGroup);

 private:
    struct MetaEntry {
--- a/code/AssetLib/AC/ACLoader.cpp
+++ b/code/AssetLib/AC/ACLoader.cpp
@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -60,9 +60,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/Importer.hpp>
 #include <memory>

-namespace Assimp {
+using namespace Assimp;

-static constexpr aiImporterDesc desc = {
+static const aiImporterDesc desc = {
    "AC3D Importer",
    "",
    "",
@ -77,8 +77,8 @@ static constexpr aiImporterDesc desc = {

 // ------------------------------------------------------------------------------------------------
 // skip to the next token
-inline const char *AcSkipToNextToken(const char *buffer, const char *end) {
-    if (!SkipSpaces(&buffer, end)) {
+inline const char *AcSkipToNextToken(const char *buffer) {
+    if (!SkipSpaces(&buffer)) {
        ASSIMP_LOG_ERROR("AC3D: Unexpected EOF/EOL");
    }
    return buffer;
@ -86,13 +86,13 @@ inline const char *AcSkipToNextToken(const char *buffer, const char *end) {

 // ------------------------------------------------------------------------------------------------
 // read a string (may be enclosed in double quotation marks). buffer must point to "
-inline const char *AcGetString(const char *buffer, const char *end, std::string &out) {
+inline const char *AcGetString(const char *buffer, std::string &out) {
    if (*buffer == '\0') {
        throw DeadlyImportError("AC3D: Unexpected EOF in string");
    }
    ++buffer;
    const char *sz = buffer;
-    while ('\"' != *buffer && buffer != end) {
+    while ('\"' != *buffer) {
        if (IsLineEnd(*buffer)) {
            ASSIMP_LOG_ERROR("AC3D: Unexpected EOF/EOL in string");
            out = "ERROR";
@ -112,8 +112,8 @@ inline const char *AcGetString(const char *buffer, const char *end, std::string
 // ------------------------------------------------------------------------------------------------
 // read 1 to n floats prefixed with an optional predefined identifier
 template <class T>
-inline const char *TAcCheckedLoadFloatArray(const char *buffer, const char *end, const char *name, size_t name_length, size_t num, T *out) {
-    buffer = AcSkipToNextToken(buffer, end);
+inline const char *TAcCheckedLoadFloatArray(const char *buffer, const char *name, size_t name_length, size_t num, T *out) {
+    buffer = AcSkipToNextToken(buffer);
    if (0 != name_length) {
        if (0 != strncmp(buffer, name, name_length) || !IsSpace(buffer[name_length])) {
            ASSIMP_LOG_ERROR("AC3D: Unexpected token. ", name, " was expected.");
@ -122,7 +122,7 @@ inline const char *TAcCheckedLoadFloatArray(const char *buffer, const char *end,
        buffer += name_length + 1;
    }
    for (unsigned int _i = 0; _i < num; ++_i) {
-        buffer = AcSkipToNextToken(buffer, end);
+        buffer = AcSkipToNextToken(buffer);
        buffer = fast_atoreal_move<float>(buffer, ((float *)out)[_i]);
    }

@ -132,7 +132,7 @@ inline const char *TAcCheckedLoadFloatArray(const char *buffer, const char *end,
 // ------------------------------------------------------------------------------------------------
 // Constructor to be privately used by Importer
 AC3DImporter::AC3DImporter() :
-        mBuffer(),
+        buffer(),
        configSplitBFCull(),
        configEvalSubdivision(),
        mNumMeshes(),
@ -146,7 +146,9 @@ AC3DImporter::AC3DImporter() :

 // ------------------------------------------------------------------------------------------------
 // Destructor, private as well
-AC3DImporter::~AC3DImporter() = default;
+AC3DImporter::~AC3DImporter() {
+    // nothing to be done here
+}

 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
@ -164,25 +166,25 @@ const aiImporterDesc *AC3DImporter::GetInfo() const {
 // ------------------------------------------------------------------------------------------------
 // Get a pointer to the next line from the file
 bool AC3DImporter::GetNextLine() {
-    SkipLine(&mBuffer.data, mBuffer.end);
-    return SkipSpaces(&mBuffer.data, mBuffer.end);
+    SkipLine(&buffer);
+    return SkipSpaces(&buffer);
 }

 // ------------------------------------------------------------------------------------------------
 // Parse an object section in an AC file
-bool AC3DImporter::LoadObjectSection(std::vector<Object> &objects) {
-    if (!TokenMatch(mBuffer.data, "OBJECT", 6))
-        return false;
+void AC3DImporter::LoadObjectSection(std::vector<Object> &objects) {
+    if (!TokenMatch(buffer, "OBJECT", 6))
+        return;

-    SkipSpaces(&mBuffer.data, mBuffer.end);
+    SkipSpaces(&buffer);

    ++mNumMeshes;

-    objects.emplace_back();
+    objects.push_back(Object());
    Object &obj = objects.back();

    aiLight *light = nullptr;
-    if (!ASSIMP_strincmp(mBuffer.data, "light", 5)) {
+    if (!ASSIMP_strincmp(buffer, "light", 5)) {
        // This is a light source. Add it to the list
        mLights->push_back(light = new aiLight());

@ -193,71 +195,65 @@ bool AC3DImporter::LoadObjectSection(std::vector<Object> &objects) {

        // Generate a default name for both the light source and the node
        // FIXME - what's the right way to print a size_t? Is 'zu' universally available? stick with the safe version.
-        light->mName.length = ::ai_snprintf(light->mName.data, AI_MAXLEN, "ACLight_%i", static_cast<unsigned int>(mLights->size()) - 1);
+        light->mName.length = ::ai_snprintf(light->mName.data, MAXLEN, "ACLight_%i", static_cast<unsigned int>(mLights->size()) - 1);
        obj.name = std::string(light->mName.data);

        ASSIMP_LOG_VERBOSE_DEBUG("AC3D: Light source encountered");
        obj.type = Object::Light;
-    } else if (!ASSIMP_strincmp(mBuffer.data, "group", 5)) {
+    } else if (!ASSIMP_strincmp(buffer, "group", 5)) {
        obj.type = Object::Group;
-    } else if (!ASSIMP_strincmp(mBuffer.data, "world", 5)) {
+    } else if (!ASSIMP_strincmp(buffer, "world", 5)) {
        obj.type = Object::World;
    } else
        obj.type = Object::Poly;
    while (GetNextLine()) {
-        if (TokenMatch(mBuffer.data, "kids", 4)) {
-            SkipSpaces(&mBuffer.data, mBuffer.end);
-            unsigned int num = strtoul10(mBuffer.data, &mBuffer.data);
+        if (TokenMatch(buffer, "kids", 4)) {
+            SkipSpaces(&buffer);
+            unsigned int num = strtoul10(buffer, &buffer);
            GetNextLine();
            if (num) {
                // load the children of this object recursively
                obj.children.reserve(num);
-                for (unsigned int i = 0; i < num; ++i) {
-                    if (!LoadObjectSection(obj.children)) {
-                        ASSIMP_LOG_WARN("AC3D: wrong number of kids");
-                        break;
-                    }
-                }
+                for (unsigned int i = 0; i < num; ++i)
+                    LoadObjectSection(obj.children);
            }
-            return true;
-        } else if (TokenMatch(mBuffer.data, "name", 4)) {
-            SkipSpaces(&mBuffer.data, mBuffer.data);
-            mBuffer.data = AcGetString(mBuffer.data, mBuffer.end, obj.name);
+            return;
+        } else if (TokenMatch(buffer, "name", 4)) {
+            SkipSpaces(&buffer);
+            buffer = AcGetString(buffer, obj.name);

            // If this is a light source, we'll also need to store
            // the name of the node in it.
            if (light) {
                light->mName.Set(obj.name);
            }
-        } else if (TokenMatch(mBuffer.data, "texture", 7)) {
-            SkipSpaces(&mBuffer.data, mBuffer.end);
-            std::string texture;
-            mBuffer.data = AcGetString(mBuffer.data, mBuffer.end, texture);
-            obj.textures.push_back(texture);
-        } else if (TokenMatch(mBuffer.data, "texrep", 6)) {
-            SkipSpaces(&mBuffer.data, mBuffer.end);
-            mBuffer.data = TAcCheckedLoadFloatArray(mBuffer.data, mBuffer.end, "", 0, 2, &obj.texRepeat);
+        } else if (TokenMatch(buffer, "texture", 7)) {
+            SkipSpaces(&buffer);
+            buffer = AcGetString(buffer, obj.texture);
+        } else if (TokenMatch(buffer, "texrep", 6)) {
+            SkipSpaces(&buffer);
+            buffer = TAcCheckedLoadFloatArray(buffer, "", 0, 2, &obj.texRepeat);
            if (!obj.texRepeat.x || !obj.texRepeat.y)
                obj.texRepeat = aiVector2D(1.f, 1.f);
-        } else if (TokenMatch(mBuffer.data, "texoff", 6)) {
-            SkipSpaces(&mBuffer.data, mBuffer.end);
-            mBuffer.data = TAcCheckedLoadFloatArray(mBuffer.data, mBuffer.end, "", 0, 2, &obj.texOffset);
-        } else if (TokenMatch(mBuffer.data, "rot", 3)) {
-            SkipSpaces(&mBuffer.data, mBuffer.end);
-            mBuffer.data = TAcCheckedLoadFloatArray(mBuffer.data, mBuffer.end, "", 0, 9, &obj.rotation);
-        } else if (TokenMatch(mBuffer.data, "loc", 3)) {
-            SkipSpaces(&mBuffer.data, mBuffer.end);
-            mBuffer.data = TAcCheckedLoadFloatArray(mBuffer.data, mBuffer.end, "", 0, 3, &obj.translation);
-        } else if (TokenMatch(mBuffer.data, "subdiv", 6)) {
-            SkipSpaces(&mBuffer.data, mBuffer.end);
-            obj.subDiv = strtoul10(mBuffer.data, &mBuffer.data);
-        } else if (TokenMatch(mBuffer.data, "crease", 6)) {
-            SkipSpaces(&mBuffer.data, mBuffer.end);
-            obj.crease = fast_atof(mBuffer.data);
-        } else if (TokenMatch(mBuffer.data, "numvert", 7)) {
-            SkipSpaces(&mBuffer.data, mBuffer.end);
+        } else if (TokenMatch(buffer, "texoff", 6)) {
+            SkipSpaces(&buffer);
+            buffer = TAcCheckedLoadFloatArray(buffer, "", 0, 2, &obj.texOffset);
+        } else if (TokenMatch(buffer, "rot", 3)) {
+            SkipSpaces(&buffer);
+            buffer = TAcCheckedLoadFloatArray(buffer, "", 0, 9, &obj.rotation);
+        } else if (TokenMatch(buffer, "loc", 3)) {
+            SkipSpaces(&buffer);
+            buffer = TAcCheckedLoadFloatArray(buffer, "", 0, 3, &obj.translation);
+        } else if (TokenMatch(buffer, "subdiv", 6)) {
+            SkipSpaces(&buffer);
+            obj.subDiv = strtoul10(buffer, &buffer);
+        } else if (TokenMatch(buffer, "crease", 6)) {
+            SkipSpaces(&buffer);
+            obj.crease = fast_atof(buffer);
+        } else if (TokenMatch(buffer, "numvert", 7)) {
+            SkipSpaces(&buffer);

-            unsigned int t = strtoul10(mBuffer.data, &mBuffer.data);
+            unsigned int t = strtoul10(buffer, &buffer);
            if (t >= AI_MAX_ALLOC(aiVector3D)) {
                throw DeadlyImportError("AC3D: Too many vertices, would run out of memory");
            }
@ -266,59 +262,59 @@ bool AC3DImporter::LoadObjectSection(std::vector<Object> &objects) {
                if (!GetNextLine()) {
                    ASSIMP_LOG_ERROR("AC3D: Unexpected EOF: not all vertices have been parsed yet");
                    break;
-                } else if (!IsNumeric(*mBuffer.data)) {
+                } else if (!IsNumeric(*buffer)) {
                    ASSIMP_LOG_ERROR("AC3D: Unexpected token: not all vertices have been parsed yet");
-                    --mBuffer.data; // make sure the line is processed a second time
+                    --buffer; // make sure the line is processed a second time
                    break;
                }
-                obj.vertices.emplace_back();
+                obj.vertices.push_back(aiVector3D());
                aiVector3D &v = obj.vertices.back();
-                mBuffer.data = TAcCheckedLoadFloatArray(mBuffer.data, mBuffer.end, "", 0, 3, &v.x);
+                buffer = TAcCheckedLoadFloatArray(buffer, "", 0, 3, &v.x);
            }
-        } else if (TokenMatch(mBuffer.data, "numsurf", 7)) {
-            SkipSpaces(&mBuffer.data, mBuffer.end);
+        } else if (TokenMatch(buffer, "numsurf", 7)) {
+            SkipSpaces(&buffer);

            bool Q3DWorkAround = false;

-            const unsigned int t = strtoul10(mBuffer.data, &mBuffer.data);
+            const unsigned int t = strtoul10(buffer, &buffer);
            obj.surfaces.reserve(t);
            for (unsigned int i = 0; i < t; ++i) {
                GetNextLine();
-                if (!TokenMatch(mBuffer.data, "SURF", 4)) {
+                if (!TokenMatch(buffer, "SURF", 4)) {
                    // FIX: this can occur for some files - Quick 3D for
                    // example writes no surf chunks
                    if (!Q3DWorkAround) {
                        ASSIMP_LOG_WARN("AC3D: SURF token was expected");
                        ASSIMP_LOG_VERBOSE_DEBUG("Continuing with Quick3D Workaround enabled");
                    }
-                    --mBuffer.data; // make sure the line is processed a second time
+                    --buffer; // make sure the line is processed a second time
                    // break; --- see fix notes above

                    Q3DWorkAround = true;
                }
-                SkipSpaces(&mBuffer.data, mBuffer.end);
-                obj.surfaces.emplace_back();
+                SkipSpaces(&buffer);
+                obj.surfaces.push_back(Surface());
                Surface &surf = obj.surfaces.back();
-                surf.flags = strtoul_cppstyle(mBuffer.data);
+                surf.flags = strtoul_cppstyle(buffer);

-                while (true) {
+                while (1) {
                    if (!GetNextLine()) {
                        throw DeadlyImportError("AC3D: Unexpected EOF: surface is incomplete");
                    }
-                    if (TokenMatch(mBuffer.data, "mat", 3)) {
-                        SkipSpaces(&mBuffer.data, mBuffer.end);
-                        surf.mat = strtoul10(mBuffer.data);
-                    } else if (TokenMatch(mBuffer.data, "refs", 4)) {
+                    if (TokenMatch(buffer, "mat", 3)) {
+                        SkipSpaces(&buffer);
+                        surf.mat = strtoul10(buffer);
+                    } else if (TokenMatch(buffer, "refs", 4)) {
                        // --- see fix notes above
                        if (Q3DWorkAround) {
                            if (!surf.entries.empty()) {
-                                mBuffer.data -= 6;
+                                buffer -= 6;
                                break;
                            }
                        }

-                        SkipSpaces(&mBuffer.data, mBuffer.end);
-                        const unsigned int m = strtoul10(mBuffer.data);
+                        SkipSpaces(&buffer);
+                        const unsigned int m = strtoul10(buffer);
                        surf.entries.reserve(m);

                        obj.numRefs += m;
@ -328,15 +324,15 @@ bool AC3DImporter::LoadObjectSection(std::vector<Object> &objects) {
                                ASSIMP_LOG_ERROR("AC3D: Unexpected EOF: surface references are incomplete");
                                break;
                            }
-                            surf.entries.emplace_back();
+                            surf.entries.push_back(Surface::SurfaceEntry());
                            Surface::SurfaceEntry &entry = surf.entries.back();

-                            entry.first = strtoul10(mBuffer.data, &mBuffer.data);
-                            SkipSpaces(&mBuffer.data, mBuffer.end);
-                            mBuffer.data = TAcCheckedLoadFloatArray(mBuffer.data, mBuffer.end, "", 0, 2, &entry.second);
+                            entry.first = strtoul10(buffer, &buffer);
+                            SkipSpaces(&buffer);
+                            buffer = TAcCheckedLoadFloatArray(buffer, "", 0, 2, &entry.second);
                        }
                    } else {
-                        --mBuffer.data; // make sure the line is processed a second time
+                        --buffer; // make sure the line is processed a second time
                        break;
                    }
                }
@ -344,7 +340,6 @@ bool AC3DImporter::LoadObjectSection(std::vector<Object> &objects) {
        }
    }
    ASSIMP_LOG_ERROR("AC3D: Unexpected EOF: \'kids\' line was expected");
-    return false;
 }

 // ------------------------------------------------------------------------------------------------
@ -358,8 +353,8 @@ void AC3DImporter::ConvertMaterial(const Object &object,
        s.Set(matSrc.name);
        matDest.AddProperty(&s, AI_MATKEY_NAME);
    }
-    if (!object.textures.empty()) {
-        s.Set(object.textures[0]);
+    if (object.texture.length()) {
+        s.Set(object.texture);
        matDest.AddProperty(&s, AI_MATKEY_TEXTURE_DIFFUSE(0));

        // UV transformation
@ -450,7 +445,7 @@ aiNode *AC3DImporter::ConvertObjectSection(Object &object,
                    idx = 0;
                }
                if ((*it).entries.empty()) {
-                    ASSIMP_LOG_WARN("AC3D: surface has zero vertex references");
+                    ASSIMP_LOG_WARN("AC3D: surface her zero vertex references");
                }

                // validate all vertex indices to make sure we won't crash here
@ -468,15 +463,16 @@ aiNode *AC3DImporter::ConvertObjectSection(Object &object,
                }

                switch ((*it).GetType()) {
-                case Surface::ClosedLine: // closed line
-                    needMat[idx].first += static_cast<unsigned int>((*it).entries.size());
-                    needMat[idx].second += static_cast<unsigned int>((*it).entries.size() << 1u);
+                    // closed line
+                case Surface::ClosedLine:
+                    needMat[idx].first += (unsigned int)(*it).entries.size();
+                    needMat[idx].second += (unsigned int)(*it).entries.size() << 1u;
                    break;

                    // unclosed line
                case Surface::OpenLine:
-                    needMat[idx].first += static_cast<unsigned int>((*it).entries.size() - 1);
-                    needMat[idx].second += static_cast<unsigned int>(((*it).entries.size() - 1) << 1u);
+                    needMat[idx].first += (unsigned int)(*it).entries.size() - 1;
+                    needMat[idx].second += ((unsigned int)(*it).entries.size() - 1) << 1u;
                    break;

                    // triangle strip
@ -538,7 +534,7 @@ aiNode *AC3DImporter::ConvertObjectSection(Object &object,
                // allocate UV coordinates, but only if the texture name for the
                // surface is not empty
                aiVector3D *uv = nullptr;
-                if (!object.textures.empty()) {
+                if (object.texture.length()) {
                    uv = mesh->mTextureCoords[0] = new aiVector3D[mesh->mNumVertices];
                    mesh->mNumUVComponents[0] = 2;
                }
@ -578,6 +574,15 @@ aiNode *AC3DImporter::ConvertObjectSection(Object &object,
                                const Surface::SurfaceEntry &entry2 = src.entries[i + 1];
                                const Surface::SurfaceEntry &entry3 = src.entries[i + 2];

+                                // skip degenerate triangles
+                                if (object.vertices[entry1.first] == object.vertices[entry2.first] ||
+                                        object.vertices[entry1.first] == object.vertices[entry3.first] ||
+                                        object.vertices[entry2.first] == object.vertices[entry3.first]) {
+                                    mesh->mNumFaces--;
+                                    mesh->mNumVertices -= 3;
+                                    continue;
+                                }
+
                                aiFace &face = *faces++;
                                face.mNumIndices = 3;
                                face.mIndices = new unsigned int[face.mNumIndices];
@ -696,18 +701,18 @@ aiNode *AC3DImporter::ConvertObjectSection(Object &object,
        // generate a name depending on the type of the node
        switch (object.type) {
        case Object::Group:
-            node->mName.length = ::ai_snprintf(node->mName.data, AI_MAXLEN, "ACGroup_%i", mGroupsCounter++);
+            node->mName.length = ::ai_snprintf(node->mName.data, MAXLEN, "ACGroup_%i", mGroupsCounter++);
            break;
        case Object::Poly:
-            node->mName.length = ::ai_snprintf(node->mName.data, AI_MAXLEN, "ACPoly_%i", mPolysCounter++);
+            node->mName.length = ::ai_snprintf(node->mName.data, MAXLEN, "ACPoly_%i", mPolysCounter++);
            break;
        case Object::Light:
-            node->mName.length = ::ai_snprintf(node->mName.data, AI_MAXLEN, "ACLight_%i", mLightsCounter++);
+            node->mName.length = ::ai_snprintf(node->mName.data, MAXLEN, "ACLight_%i", mLightsCounter++);
            break;

            // there shouldn't be more than one world, but we don't care
        case Object::World:
-            node->mName.length = ::ai_snprintf(node->mName.data, AI_MAXLEN, "ACWorld_%i", mWorldsCounter++);
+            node->mName.length = ::ai_snprintf(node->mName.data, MAXLEN, "ACWorld_%i", mWorldsCounter++);
            break;
        }
    }
@ -747,7 +752,7 @@ void AC3DImporter::InternReadFile(const std::string &pFile,
    std::unique_ptr<IOStream> file(pIOHandler->Open(pFile, "rb"));

    // Check whether we can read from the file
-    if (file == nullptr) {
+    if (file.get() == nullptr) {
        throw DeadlyImportError("Failed to open AC3D file ", pFile, ".");
    }

@ -755,18 +760,17 @@ void AC3DImporter::InternReadFile(const std::string &pFile,
    std::vector<char> mBuffer2;
    TextFileToBuffer(file.get(), mBuffer2);

-    mBuffer.data = &mBuffer2[0];
-    mBuffer.end = &mBuffer2[0] + mBuffer2.size();
+    buffer = &mBuffer2[0];
    mNumMeshes = 0;

    mLightsCounter = mPolysCounter = mWorldsCounter = mGroupsCounter = 0;

-    if (::strncmp(mBuffer.data, "AC3D", 4)) {
+    if (::strncmp(buffer, "AC3D", 4)) {
        throw DeadlyImportError("AC3D: No valid AC3D file, magic sequence not found");
    }

    // print the file format version to the console
-    unsigned int version = HexDigitToDecimal(mBuffer.data[4]);
+    unsigned int version = HexDigitToDecimal(buffer[4]);
    char msg[3];
    ASSIMP_itoa10(msg, 3, version);
    ASSIMP_LOG_INFO("AC3D file format version: ", msg);
@ -781,36 +785,35 @@ void AC3DImporter::InternReadFile(const std::string &pFile,
    mLights = &lights;

    while (GetNextLine()) {
-        if (TokenMatch(mBuffer.data, "MATERIAL", 8)) {
-            materials.emplace_back();
+        if (TokenMatch(buffer, "MATERIAL", 8)) {
+            materials.push_back(Material());
            Material &mat = materials.back();

            // manually parse the material ... sscanf would use the buldin atof ...
            // Format: (name) rgb %f %f %f  amb %f %f %f  emis %f %f %f  spec %f %f %f  shi %d  trans %f

-            mBuffer.data = AcSkipToNextToken(mBuffer.data, mBuffer.end);
-            if ('\"' == *mBuffer.data) {
-                mBuffer.data = AcGetString(mBuffer.data, mBuffer.end, mat.name);
-                mBuffer.data = AcSkipToNextToken(mBuffer.data, mBuffer.end);
+            buffer = AcSkipToNextToken(buffer);
+            if ('\"' == *buffer) {
+                buffer = AcGetString(buffer, mat.name);
+                buffer = AcSkipToNextToken(buffer);
            }

-            mBuffer.data = TAcCheckedLoadFloatArray(mBuffer.data, mBuffer.end, "rgb", 3, 3, &mat.rgb);
-            mBuffer.data = TAcCheckedLoadFloatArray(mBuffer.data, mBuffer.end, "amb", 3, 3, &mat.amb);
-            mBuffer.data = TAcCheckedLoadFloatArray(mBuffer.data, mBuffer.end, "emis", 4, 3, &mat.emis);
-            mBuffer.data = TAcCheckedLoadFloatArray(mBuffer.data, mBuffer.end, "spec", 4, 3, &mat.spec);
-            mBuffer.data = TAcCheckedLoadFloatArray(mBuffer.data, mBuffer.end, "shi", 3, 1, &mat.shin);
-            mBuffer.data = TAcCheckedLoadFloatArray(mBuffer.data, mBuffer.end, "trans", 5, 1, &mat.trans);
-        } else {
-            LoadObjectSection(rootObjects);
+            buffer = TAcCheckedLoadFloatArray(buffer, "rgb", 3, 3, &mat.rgb);
+            buffer = TAcCheckedLoadFloatArray(buffer, "amb", 3, 3, &mat.amb);
+            buffer = TAcCheckedLoadFloatArray(buffer, "emis", 4, 3, &mat.emis);
+            buffer = TAcCheckedLoadFloatArray(buffer, "spec", 4, 3, &mat.spec);
+            buffer = TAcCheckedLoadFloatArray(buffer, "shi", 3, 1, &mat.shin);
+            buffer = TAcCheckedLoadFloatArray(buffer, "trans", 5, 1, &mat.trans);
        }
+        LoadObjectSection(rootObjects);
    }

-    if (rootObjects.empty() || mNumMeshes == 0u) {
+    if (rootObjects.empty() || !mNumMeshes) {
        throw DeadlyImportError("AC3D: No meshes have been loaded");
    }
    if (materials.empty()) {
        ASSIMP_LOG_WARN("AC3D: No material has been found");
-        materials.emplace_back();
+        materials.push_back(Material());
    }

    mNumMeshes += (mNumMeshes >> 2u) + 1;
@ -821,7 +824,7 @@ void AC3DImporter::InternReadFile(const std::string &pFile,
    materials.reserve(mNumMeshes);

    // generate a dummy root if there are multiple objects on the top layer
-    Object *root = nullptr;
+    Object *root;
    if (1 == rootObjects.size())
        root = &rootObjects[0];
    else {
@ -834,7 +837,7 @@ void AC3DImporter::InternReadFile(const std::string &pFile,
        delete root;
    }

-    if (::strncmp(pScene->mRootNode->mName.data, "Node", 4) == 0) {
+    if (!::strncmp(pScene->mRootNode->mName.data, "Node", 4)) {
        pScene->mRootNode->mName.Set("<AC3DWorld>");
    }

@ -853,12 +856,10 @@ void AC3DImporter::InternReadFile(const std::string &pFile,

    // copy lights
    pScene->mNumLights = (unsigned int)lights.size();
-    if (!lights.empty()) {
+    if (lights.size()) {
        pScene->mLights = new aiLight *[lights.size()];
        ::memcpy(pScene->mLights, &lights[0], lights.size() * sizeof(void *));
    }
 }

-} // namespace Assimp
-
 #endif //!defined ASSIMP_BUILD_NO_AC_IMPORTER
--- a/code/AssetLib/AC/ACLoader.h
+++ b/code/AssetLib/AC/ACLoader.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -125,6 +125,7 @@ public:
                type(World),
                name(),
                children(),
+                texture(),
                texRepeat(1.f, 1.f),
                texOffset(0.0f, 0.0f),
                rotation(),
@ -150,8 +151,7 @@ public:
        std::vector<Object> children;

        // texture to be assigned to all surfaces of the object
-        // the .acc format supports up to 4 textures
-        std::vector<std::string> textures;
+        std::string texture;

        // texture repat factors (scaling for all coordinates)
        aiVector2D texRepeat, texOffset;
@ -216,7 +216,7 @@ private:
     *  load subobjects, the method returns after a 'kids 0' was
     *  encountered.
     *  @objects List of output objects*/
-    bool LoadObjectSection(std::vector<Object> &objects);
+    void LoadObjectSection(std::vector<Object> &objects);

    // -------------------------------------------------------------------
    /** Convert all objects into meshes and nodes.
@ -242,7 +242,7 @@ private:

 private:
    // points to the next data line
-    aiBuffer mBuffer;
+    const char *buffer;

    // Configuration option: if enabled, up to two meshes
    // are generated per material: those faces who have
--- a/code/AssetLib/AMF/AMFImporter.cpp
+++ b/code/AssetLib/AMF/AMFImporter.cpp
@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 namespace Assimp {

-static constexpr aiImporterDesc Description = {
+const aiImporterDesc AMFImporter::Description = {
    "Additive manufacturing file format(AMF) Importer",
    "smalcom",
    "",
@ -83,7 +83,11 @@ void AMFImporter::Clear() {

 AMFImporter::AMFImporter() AI_NO_EXCEPT :
        mNodeElement_Cur(nullptr),
-        mXmlParser(nullptr) {
+        mXmlParser(nullptr),
+        mUnit(),
+        mVersion(),
+        mMaterial_Converted(),
+        mTexture_Converted() {
    // empty
 }

@ -178,6 +182,28 @@ bool AMFImporter::XML_SearchNode(const std::string &nodeName) {
    return nullptr != mXmlParser->findNode(nodeName);
 }

+void AMFImporter::ParseHelper_FixTruncatedFloatString(const char *pInStr, std::string &pOutString) {
+    size_t instr_len;
+
+    pOutString.clear();
+    instr_len = strlen(pInStr);
+    if (!instr_len) return;
+
+    pOutString.reserve(instr_len * 3 / 2);
+    // check and correct floats in format ".x". Must be "x.y".
+    if (pInStr[0] == '.') pOutString.push_back('0');
+
+    pOutString.push_back(pInStr[0]);
+    for (size_t ci = 1; ci < instr_len; ci++) {
+        if ((pInStr[ci] == '.') && ((pInStr[ci - 1] == ' ') || (pInStr[ci - 1] == '-') || (pInStr[ci - 1] == '+') || (pInStr[ci - 1] == '\t'))) {
+            pOutString.push_back('0');
+            pOutString.push_back('.');
+        } else {
+            pOutString.push_back(pInStr[ci]);
+        }
+    }
+}
+
 static bool ParseHelper_Decode_Base64_IsBase64(const char pChar) {
    return (isalnum((unsigned char)pChar) || (pChar == '+') || (pChar == '/'));
 }
@ -191,10 +217,7 @@ void AMFImporter::ParseHelper_Decode_Base64(const std::string &pInputBase64, std
    uint8_t arr4[4], arr3[3];

    // check input data
-    if (pInputBase64.size() % 4) {
-        throw DeadlyImportError("Base64-encoded data must have size multiply of four.");
-    }
-
+    if (pInputBase64.size() % 4) throw DeadlyImportError("Base64-encoded data must have size multiply of four.");
    // prepare output place
    pOutputData.clear();
    pOutputData.reserve(pInputBase64.size() / 4 * 3);
@ -238,7 +261,7 @@ void AMFImporter::ParseFile(const std::string &pFile, IOSystem *pIOHandler) {
    std::unique_ptr<IOStream> file(pIOHandler->Open(pFile, "rb"));

    // Check whether we can read from the file
-    if (file == nullptr) {
+    if (file.get() == nullptr) {
        throw DeadlyImportError("Failed to open AMF file ", pFile, ".");
    }

@ -384,17 +407,17 @@ void AMFImporter::ParseNode_Instance(XmlNode &node) {
        for (auto &currentNode : node.children()) {
            const std::string &currentName = currentNode.name();
            if (currentName == "deltax") {
-                XmlParser::getValueAsReal(currentNode, als.Delta.x);
+                XmlParser::getValueAsFloat(currentNode, als.Delta.x);
            } else if (currentName == "deltay") {
-                XmlParser::getValueAsReal(currentNode, als.Delta.y);
+                XmlParser::getValueAsFloat(currentNode, als.Delta.y);
            } else if (currentName == "deltaz") {
-                XmlParser::getValueAsReal(currentNode, als.Delta.z);
+                XmlParser::getValueAsFloat(currentNode, als.Delta.z);
            } else if (currentName == "rx") {
-                XmlParser::getValueAsReal(currentNode, als.Delta.x);
+                XmlParser::getValueAsFloat(currentNode, als.Delta.x);
            } else if (currentName == "ry") {
-                XmlParser::getValueAsReal(currentNode, als.Delta.y);
+                XmlParser::getValueAsFloat(currentNode, als.Delta.y);
            } else if (currentName == "rz") {
-                XmlParser::getValueAsReal(currentNode, als.Delta.z);
+                XmlParser::getValueAsFloat(currentNode, als.Delta.z);
            }
        }
        ParseHelper_Node_Exit();
--- a/code/AssetLib/AMF/AMFImporter.hpp
+++ b/code/AssetLib/AMF/AMFImporter.hpp
@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -98,12 +98,8 @@ namespace Assimp {
 ///            old - <map> and children <u1>, <u2>, <u3>, <v1>, <v2>, <v3>
 ///
 class AMFImporter : public BaseImporter {
-    using AMFMetaDataArray = std::vector<AMFMetadata *>;
-    using MeshArray = std::vector<aiMesh *>;
-    using NodeArray = std::vector<aiNode *>;
-
-public:
-    struct SPP_Material;
+private:
+    struct SPP_Material; // forward declaration

    /// Data type for post-processing step. More suitable container for part of material's composition.
    struct SPP_Composite {
@ -111,6 +107,22 @@ public:
        std::string Formula; ///< Formula for calculating ratio of \ref Material.
    };

+    /// \struct SPP_Material
+    /// Data type for post-processing step. More suitable container for material.
+    struct SPP_Material {
+        std::string ID; ///< Material ID.
+        std::list<AMFMetadata *> Metadata; ///< Metadata of material.
+        AMFColor *Color; ///< Color of material.
+        std::list<SPP_Composite> Composition; ///< List of child materials if current material is composition of few another.
+
+        /// Return color calculated for specified coordinate.
+        /// \param [in] pX - "x" coordinate.
+        /// \param [in] pY - "y" coordinate.
+        /// \param [in] pZ - "z" coordinate.
+        /// \return calculated color.
+        aiColor4D GetColor(const float pX, const float pY, const float pZ) const;
+    };
+
    /// Data type for post-processing step. More suitable container for texture.
    struct SPP_Texture {
        std::string ID;
@ -127,51 +139,10 @@ public:
        const AMFTexMap *TexMap; ///< Face texture mapping data. Equal to nullptr if texture mapping is not set for the face.
    };

-    /// Data type for post-processing step. More suitable container for material.
-    struct SPP_Material {
-        std::string ID; ///< Material ID.
-        std::list<AMFMetadata *> Metadata; ///< Metadata of material.
-        AMFColor *Color; ///< Color of material.
-        std::list<SPP_Composite> Composition; ///< List of child materials if current material is composition of few another.
+    using AMFMetaDataArray = std::vector<AMFMetadata*>;
+    using MeshArray = std::vector<aiMesh*>;
+    using NodeArray = std::vector<aiNode*>;

-        /// Return color calculated for specified coordinate.
-        /// \param [in] pX - "x" coordinate.
-        /// \param [in] pY - "y" coordinate.
-        /// \param [in] pZ - "z" coordinate.
-        /// \return calculated color.
-        aiColor4D GetColor(const float pX, const float pY, const float pZ) const;
-    };
-
-    /// Default constructor.
-    AMFImporter() AI_NO_EXCEPT;
-
-    /// Default destructor.
-    ~AMFImporter() override;
-
-    /// Parse AMF file and fill scene graph. The function has no return value. Result can be found by analyzing the generated graph.
-    /// Also exception can be thrown if trouble will found.
-    /// \param [in] pFile - name of file to be parsed.
-    /// \param [in] pIOHandler - pointer to IO helper object.
-    void ParseFile(const std::string &pFile, IOSystem *pIOHandler);
-    void ParseHelper_Node_Enter(AMFNodeElementBase *child);
-    void ParseHelper_Node_Exit();
-    bool CanRead(const std::string &pFile, IOSystem *pIOHandler, bool pCheckSig) const override;
-    void InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler) override;
-    const aiImporterDesc *GetInfo() const override;
-    bool Find_NodeElement(const std::string &pID, const AMFNodeElementBase::EType pType, AMFNodeElementBase **pNodeElement) const;
-    bool Find_ConvertedNode(const std::string &pID, NodeArray &nodeArray, aiNode **pNode) const;
-    bool Find_ConvertedMaterial(const std::string &pID, const SPP_Material **pConvertedMaterial) const;
-    AI_WONT_RETURN void Throw_CloseNotFound(const std::string &nodeName) AI_WONT_RETURN_SUFFIX;
-    AI_WONT_RETURN void Throw_IncorrectAttr(const std::string &nodeName, const std::string &pAttrName) AI_WONT_RETURN_SUFFIX;
-    AI_WONT_RETURN void Throw_IncorrectAttrValue(const std::string &nodeName, const std::string &pAttrName) AI_WONT_RETURN_SUFFIX;
-    AI_WONT_RETURN void Throw_MoreThanOnceDefined(const std::string &nodeName, const std::string &pNodeType, const std::string &pDescription) AI_WONT_RETURN_SUFFIX;
-    AI_WONT_RETURN void Throw_ID_NotFound(const std::string &pID) const AI_WONT_RETURN_SUFFIX;
-    void XML_CheckNode_MustHaveChildren(pugi::xml_node &node);
-    bool XML_SearchNode(const std::string &nodeName);
-    AMFImporter(const AMFImporter &pScene) = delete;
-    AMFImporter &operator=(const AMFImporter &pScene) = delete;
-
-private:
    /// Clear all temporary data.
    void Clear();

@ -291,9 +262,40 @@ private:
    /// \param [in] pUseOldName - if true then use old name of node(and children) - <map>, instead of new name - <texmap>.
    void ParseNode_TexMap(XmlNode &node, const bool pUseOldName = false);

+public:
+    /// Default constructor.
+    AMFImporter() AI_NO_EXCEPT;

+    /// Default destructor.
+    ~AMFImporter() override;
+
+    /// Parse AMF file and fill scene graph. The function has no return value. Result can be found by analyzing the generated graph.
+    /// Also exception can be thrown if trouble will found.
+    /// \param [in] pFile - name of file to be parsed.
+    /// \param [in] pIOHandler - pointer to IO helper object.
+    void ParseFile(const std::string &pFile, IOSystem *pIOHandler);
+    void ParseHelper_Node_Enter(AMFNodeElementBase *child);
+    void ParseHelper_Node_Exit();
+    bool CanRead(const std::string &pFile, IOSystem *pIOHandler, bool pCheckSig) const override;
+    void InternReadFile(const std::string &pFile, aiScene *pScene, IOSystem *pIOHandler) override;
+    const aiImporterDesc *GetInfo() const override;
+    bool Find_NodeElement(const std::string &pID, const AMFNodeElementBase::EType pType, AMFNodeElementBase **pNodeElement) const;
+    bool Find_ConvertedNode(const std::string &pID, NodeArray &nodeArray, aiNode **pNode) const;
+    bool Find_ConvertedMaterial(const std::string &pID, const SPP_Material **pConvertedMaterial) const;
+    void Throw_CloseNotFound(const std::string &nodeName);
+    void Throw_IncorrectAttr(const std::string &nodeName, const std::string &pAttrName);
+    void Throw_IncorrectAttrValue(const std::string &nodeName, const std::string &pAttrName);
+    void Throw_MoreThanOnceDefined(const std::string &nodeName, const std::string &pNodeType, const std::string &pDescription);
+    void Throw_ID_NotFound(const std::string &pID) const;
+    void XML_CheckNode_MustHaveChildren(pugi::xml_node &node);
+    bool XML_SearchNode(const std::string &nodeName);
+    void ParseHelper_FixTruncatedFloatString(const char *pInStr, std::string &pOutString);
+    AMFImporter(const AMFImporter &pScene) = delete;
+    AMFImporter &operator=(const AMFImporter &pScene) = delete;

 private:
+    static const aiImporterDesc Description;
+
    AMFNodeElementBase *mNodeElement_Cur; ///< Current element.
    std::list<AMFNodeElementBase *> mNodeElement_List; ///< All elements of scene graph.
    XmlParser *mXmlParser;
--- a/code/AssetLib/AMF/AMFImporter_Geometry.cpp
+++ b/code/AssetLib/AMF/AMFImporter_Geometry.cpp
@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -167,11 +167,11 @@ void AMFImporter::ParseNode_Coordinates(XmlNode &node) {
            AMFCoordinates &als = *((AMFCoordinates *)ne); // alias for convenience
            const std::string &currentName = ai_tolower(currentNode.name());
            if (currentName == "x") {
-                XmlParser::getValueAsReal(currentNode, als.Coordinate.x);
+                XmlParser::getValueAsFloat(currentNode, als.Coordinate.x);
            } else if (currentName == "y") {
-                XmlParser::getValueAsReal(currentNode, als.Coordinate.y);
+                XmlParser::getValueAsFloat(currentNode, als.Coordinate.y);
            } else if (currentName == "z") {
-                XmlParser::getValueAsReal(currentNode, als.Coordinate.z);
+                XmlParser::getValueAsFloat(currentNode, als.Coordinate.z);
            }
        }
        ParseHelper_Node_Exit();
--- a/code/AssetLib/AMF/AMFImporter_Material.cpp
+++ b/code/AssetLib/AMF/AMFImporter_Material.cpp
@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -263,25 +263,26 @@ void AMFImporter::ParseNode_TexMap(XmlNode &node, const bool pUseOldName) {
            const std::string &name = currentNode.name();
            if (name == "utex1") {
 				read_flag[0] = true;
-                XmlParser::getValueAsReal(node, als.TextureCoordinate[0].x);
+                XmlParser::getValueAsFloat(node, als.TextureCoordinate[0].x);
            } else if (name == "utex2") {
 				read_flag[1] = true;
-                XmlParser::getValueAsReal(node, als.TextureCoordinate[1].x);
+                XmlParser::getValueAsFloat(node, als.TextureCoordinate[1].x);
            } else if (name == "utex3") {
 				read_flag[2] = true;
-                XmlParser::getValueAsReal(node, als.TextureCoordinate[2].x);
+                XmlParser::getValueAsFloat(node, als.TextureCoordinate[2].x);
            } else if (name == "vtex1") {
 				read_flag[3] = true;
-                XmlParser::getValueAsReal(node, als.TextureCoordinate[0].y);
+                XmlParser::getValueAsFloat(node, als.TextureCoordinate[0].y);
            } else if (name == "vtex2") {
 				read_flag[4] = true;
-                XmlParser::getValueAsReal(node, als.TextureCoordinate[1].y);
+                XmlParser::getValueAsFloat(node, als.TextureCoordinate[1].y);
            } else if (name == "vtex3") {
 				read_flag[5] = true;
-                XmlParser::getValueAsReal(node, als.TextureCoordinate[2].y);
+                XmlParser::getValueAsFloat(node, als.TextureCoordinate[2].y);
 			}
 		}
        ParseHelper_Node_Exit();
+
 	} else {
 		for (pugi::xml_attribute &attr : node.attributes()) {
            const std::string name = attr.name();
--- a/code/AssetLib/AMF/AMFImporter_Node.hpp
+++ b/code/AssetLib/AMF/AMFImporter_Node.hpp
@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -56,6 +56,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 #include <vector>

+/// \class CAMFImporter_NodeElement
 /// Base class for elements of nodes.
 class AMFNodeElementBase {
 public:
@ -87,7 +88,9 @@ public:
 	std::list<AMFNodeElementBase *> Child; ///< Child elements.

 public: /// Destructor, virtual..
-	virtual ~AMFNodeElementBase() = default;
+	virtual ~AMFNodeElementBase() {
+		// empty
+	}

 	/// Disabled copy constructor and co.
 	AMFNodeElementBase(const AMFNodeElementBase &pNodeElement) = delete;
@ -100,11 +103,12 @@ protected:
 	/// \param [in] pType - element type.
 	/// \param [in] pParent - parent element.
 	AMFNodeElementBase(const EType pType, AMFNodeElementBase *pParent) :
-			Type(pType), Parent(pParent) {
+			Type(pType), ID(), Parent(pParent), Child() {
 		// empty
 	}
 }; // class IAMFImporter_NodeElement

+/// \struct CAMFImporter_NodeElement_Constellation
 /// A collection of objects or constellations with specific relative locations.
 struct AMFConstellation : public AMFNodeElementBase {
 	/// Constructor.
@ -114,6 +118,7 @@ struct AMFConstellation : public AMFNodeElementBase {

 }; // struct CAMFImporter_NodeElement_Constellation

+/// \struct CAMFImporter_NodeElement_Instance
 /// Part of constellation.
 struct AMFInstance : public AMFNodeElementBase {

@ -132,6 +137,7 @@ struct AMFInstance : public AMFNodeElementBase {
 			AMFNodeElementBase(ENET_Instance, pParent) {}
 };

+/// \struct CAMFImporter_NodeElement_Metadata
 /// Structure that define metadata node.
 struct AMFMetadata : public AMFNodeElementBase {

@ -144,6 +150,7 @@ struct AMFMetadata : public AMFNodeElementBase {
 			AMFNodeElementBase(ENET_Metadata, pParent) {}
 };

+/// \struct CAMFImporter_NodeElement_Root
 /// Structure that define root node.
 struct AMFRoot : public AMFNodeElementBase {

@ -156,6 +163,7 @@ struct AMFRoot : public AMFNodeElementBase {
 			AMFNodeElementBase(ENET_Root, pParent) {}
 };

+/// \struct CAMFImporter_NodeElement_Color
 /// Structure that define object node.
 struct AMFColor : public AMFNodeElementBase {
 	bool Composed; ///< Type of color stored: if true then look for formula in \ref Color_Composed[4], else - in \ref Color.
@ -166,11 +174,12 @@ struct AMFColor : public AMFNodeElementBase {
 	/// @brief  Constructor.
 	/// @param [in] pParent - pointer to parent node.
 	AMFColor(AMFNodeElementBase *pParent) :
-			AMFNodeElementBase(ENET_Color, pParent), Composed(false), Color() {
+			AMFNodeElementBase(ENET_Color, pParent), Composed(false), Color(), Profile() {
 		// empty
 	}
 };

+/// \struct CAMFImporter_NodeElement_Material
 /// Structure that define material node.
 struct AMFMaterial : public AMFNodeElementBase {

@ -180,6 +189,7 @@ struct AMFMaterial : public AMFNodeElementBase {
 			AMFNodeElementBase(ENET_Material, pParent) {}
 };

+/// \struct CAMFImporter_NodeElement_Object
 /// Structure that define object node.
 struct AMFObject : public AMFNodeElementBase {

@ -198,6 +208,7 @@ struct AMFMesh : public AMFNodeElementBase {
 			AMFNodeElementBase(ENET_Mesh, pParent) {}
 };

+/// \struct CAMFImporter_NodeElement_Vertex
 /// Structure that define vertex node.
 struct AMFVertex : public AMFNodeElementBase {
 	/// Constructor.
@ -206,6 +217,7 @@ struct AMFVertex : public AMFNodeElementBase {
 			AMFNodeElementBase(ENET_Vertex, pParent) {}
 };

+/// \struct CAMFImporter_NodeElement_Edge
 /// Structure that define edge node.
 struct AMFEdge : public AMFNodeElementBase {
 	/// Constructor.
@ -214,6 +226,7 @@ struct AMFEdge : public AMFNodeElementBase {
 			AMFNodeElementBase(ENET_Edge, pParent) {}
 };

+/// \struct CAMFImporter_NodeElement_Vertices
 /// Structure that define vertices node.
 struct AMFVertices : public AMFNodeElementBase {
 	/// Constructor.
@ -222,6 +235,7 @@ struct AMFVertices : public AMFNodeElementBase {
 			AMFNodeElementBase(ENET_Vertices, pParent) {}
 };

+/// \struct CAMFImporter_NodeElement_Volume
 /// Structure that define volume node.
 struct AMFVolume : public AMFNodeElementBase {
 	std::string MaterialID; ///< Which material to use.
@ -233,6 +247,7 @@ struct AMFVolume : public AMFNodeElementBase {
 			AMFNodeElementBase(ENET_Volume, pParent) {}
 };

+/// \struct CAMFImporter_NodeElement_Coordinates
 /// Structure that define coordinates node.
 struct AMFCoordinates : public AMFNodeElementBase {
 	aiVector3D Coordinate; ///< Coordinate.
@ -243,6 +258,7 @@ struct AMFCoordinates : public AMFNodeElementBase {
 			AMFNodeElementBase(ENET_Coordinates, pParent) {}
 };

+/// \struct CAMFImporter_NodeElement_TexMap
 /// Structure that define texture coordinates node.
 struct AMFTexMap : public AMFNodeElementBase {
 	aiVector3D TextureCoordinate[3]; ///< Texture coordinates.
@ -254,11 +270,12 @@ struct AMFTexMap : public AMFNodeElementBase {
 	/// Constructor.
 	/// \param [in] pParent - pointer to parent node.
 	AMFTexMap(AMFNodeElementBase *pParent) :
-			AMFNodeElementBase(ENET_TexMap, pParent), TextureCoordinate{} {
+			AMFNodeElementBase(ENET_TexMap, pParent), TextureCoordinate{}, TextureID_R(), TextureID_G(), TextureID_B(), TextureID_A() {
 		// empty
 	}
 };

+/// \struct CAMFImporter_NodeElement_Triangle
 /// Structure that define triangle node.
 struct AMFTriangle : public AMFNodeElementBase {
 	size_t V[3]; ///< Triangle vertices.
--- a/code/AssetLib/AMF/AMFImporter_Postprocess.cpp
+++ b/code/AssetLib/AMF/AMFImporter_Postprocess.cpp
@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -224,8 +224,7 @@ size_t AMFImporter::PostprocessHelper_GetTextureID_Or_Create(const std::string &
    }

    // Create format hint.
-    constexpr char templateColor[] = "rgba0000";
-    memcpy(converted_texture.FormatHint, templateColor, 8);
+    strcpy(converted_texture.FormatHint, "rgba0000"); // copy initial string.
    if (!r.empty()) converted_texture.FormatHint[4] = '8';
    if (!g.empty()) converted_texture.FormatHint[5] = '8';
    if (!b.empty()) converted_texture.FormatHint[6] = '8';
@ -816,7 +815,6 @@ nl_clean_loop:
            for (; next_it != nodeArray.end(); ++next_it) {
                if ((*next_it)->FindNode((*nl_it)->mName) != nullptr) {
                    // if current top node(nl_it) found in another top node then erase it from node_list and restart search loop.
-                    // FIXME: this leaks memory on test models test8.amf and test9.amf
                    nodeArray.erase(nl_it);

                    goto nl_clean_loop;
@ -868,7 +866,7 @@ nl_clean_loop:
            pScene->mTextures[idx]->mHeight = static_cast<unsigned int>(tex_convd.Height);
            pScene->mTextures[idx]->pcData = (aiTexel *)tex_convd.Data;
            // texture format description.
-            strncpy(pScene->mTextures[idx]->achFormatHint, tex_convd.FormatHint, HINTMAXTEXTURELEN);
+            strcpy(pScene->mTextures[idx]->achFormatHint, tex_convd.FormatHint);
            idx++;
        } // for(const SPP_Texture& tex_convd: mTexture_Converted)

--- a/code/AssetLib/ASE/ASELoader.cpp
+++ b/code/AssetLib/ASE/ASELoader.cpp
@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -44,6 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

 #ifndef ASSIMP_BUILD_NO_ASE_IMPORTER
+
 #ifndef ASSIMP_BUILD_NO_3DS_IMPORTER

 // internal headers
@ -63,10 +64,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // utilities
 #include <assimp/fast_atof.h>

-namespace Assimp {
+using namespace Assimp;
 using namespace Assimp::ASE;

-static constexpr aiImporterDesc desc = {
+static const aiImporterDesc desc = {
    "ASE Importer",
    "",
    "",
@ -86,6 +87,12 @@ ASEImporter::ASEImporter() :
    // empty
 }

+// ------------------------------------------------------------------------------------------------
+// Destructor, private as well
+ASEImporter::~ASEImporter() {
+    // empty
+}
+
 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
 bool ASEImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /*checkSig*/) const {
@ -117,14 +124,14 @@ void ASEImporter::InternReadFile(const std::string &pFile,
    std::unique_ptr<IOStream> file(pIOHandler->Open(pFile, "rb"));

    // Check whether we can read from the file
-    if (file == nullptr) {
+    if (file.get() == nullptr) {
        throw DeadlyImportError("Failed to open ASE file ", pFile, ".");
    }

    // Allocate storage and copy the contents of the file to a memory buffer
    std::vector<char> mBuffer2;
    TextFileToBuffer(file.get(), mBuffer2);
-    const size_t fileSize = mBuffer2.size();
+
    this->mBuffer = &mBuffer2[0];
    this->pcScene = pScene;

@ -146,7 +153,7 @@ void ASEImporter::InternReadFile(const std::string &pFile,
    };

    // Construct an ASE parser and parse the file
-    ASE::Parser parser(mBuffer, fileSize, defaultFormat);
+    ASE::Parser parser(mBuffer, defaultFormat);
    mParser = &parser;
    mParser->Parse();

@ -258,7 +265,7 @@ void ASEImporter::GenerateDefaultMaterial() {
    }
    if (bHas || mParser->m_vMaterials.empty()) {
        // add a simple material without submaterials to the parser's list
-        mParser->m_vMaterials.emplace_back(AI_DEFAULT_MATERIAL_NAME);
+        mParser->m_vMaterials.push_back(ASE::Material(AI_DEFAULT_MATERIAL_NAME));
        ASE::Material &mat = mParser->m_vMaterials.back();

        mat.mDiffuse = aiColor3D(0.6f, 0.6f, 0.6f);
@ -321,6 +328,21 @@ void ASEImporter::BuildAnimations(const std::vector<BaseNode *> &nodes) {
                aiNodeAnim *nd = pcAnim->mChannels[iNum++] = new aiNodeAnim();
                nd->mNodeName.Set(me->mName + ".Target");

+                // If there is no input position channel we will need
+                // to supply the default position from the node's
+                // local transformation matrix.
+                /*TargetAnimationHelper helper;
+                if (me->mAnim.akeyPositions.empty())
+                {
+                    aiMatrix4x4& mat = (*i)->mTransform;
+                    helper.SetFixedMainAnimationChannel(aiVector3D(
+                        mat.a4, mat.b4, mat.c4));
+                }
+                else helper.SetMainAnimationChannel (&me->mAnim.akeyPositions);
+                helper.SetTargetAnimationChannel (&me->mTargetAnim.akeyPositions);
+
+                helper.Process(&me->mTargetAnim.akeyPositions);*/
+
                // Allocate the key array and fill it
                nd->mNumPositionKeys = (unsigned int)me->mTargetAnim.akeyPositions.size();
                nd->mPositionKeys = new aiVectorKey[nd->mNumPositionKeys];
@ -446,9 +468,10 @@ void ASEImporter::BuildLights() {
 }

 // ------------------------------------------------------------------------------------------------
-void ASEImporter::AddNodes(const std::vector<BaseNode *> &nodes, aiNode *pcParent, const std::string &name) {
+void ASEImporter::AddNodes(const std::vector<BaseNode *> &nodes,
+        aiNode *pcParent, const char *szName) {
    aiMatrix4x4 m;
-    AddNodes(nodes, pcParent, name, m);
+    AddNodes(nodes, pcParent, szName, m);
 }

 // ------------------------------------------------------------------------------------------------
@ -505,9 +528,10 @@ void ASEImporter::AddMeshes(const ASE::BaseNode *snode, aiNode *node) {

 // ------------------------------------------------------------------------------------------------
 // Add child nodes to a given parent node
-void ASEImporter::AddNodes(const std::vector<BaseNode *> &nodes, aiNode *pcParent, const std::string &name,
+void ASEImporter::AddNodes(const std::vector<BaseNode *> &nodes,
+        aiNode *pcParent, const char *szName,
        const aiMatrix4x4 &mat) {
-    const size_t len = name.size();
+    const size_t len = szName ? ::strlen(szName) : 0;
    ai_assert(4 <= AI_MAX_NUMBER_OF_COLOR_SETS);

    // Receives child nodes for the pcParent node
@ -517,18 +541,16 @@ void ASEImporter::AddNodes(const std::vector<BaseNode *> &nodes, aiNode *pcParen
    // which has *us* as parent.
    for (std::vector<BaseNode *>::const_iterator it = nodes.begin(), end = nodes.end(); it != end; ++it) {
        const BaseNode *snode = *it;
-        if (!name.empty()) {
-            if (len != snode->mParent.length() || name != snode->mParent.c_str()) {
+        if (szName) {
+            if (len != snode->mParent.length() || ::strcmp(szName, snode->mParent.c_str()))
                continue;
-            }
-        } else if (snode->mParent.length()) {
+        } else if (snode->mParent.length())
            continue;
-        }

        (*it)->mProcessed = true;

        // Allocate a new node and add it to the output data structure
-        apcNodes.push_back(new aiNode);
+        apcNodes.push_back(new aiNode());
        aiNode *node = apcNodes.back();

        node->mName.Set((snode->mName.length() ? snode->mName.c_str() : "Unnamed_Node"));
@ -541,7 +563,7 @@ void ASEImporter::AddNodes(const std::vector<BaseNode *> &nodes, aiNode *pcParen

        // Add sub nodes - prevent stack overflow due to recursive parenting
        if (node->mName != node->mParent->mName && node->mName != node->mParent->mParent->mName) {
-            AddNodes(nodes, node, node->mName.C_Str(), snode->mTransform);
+            AddNodes(nodes, node, node->mName.data, snode->mTransform);
        }

        // Further processing depends on the type of the node
@ -619,8 +641,7 @@ void ASEImporter::BuildNodes(std::vector<BaseNode *> &nodes) {
    }

    // add all nodes
-    static const std::string none = "";
-    AddNodes(nodes, ch, none);
+    AddNodes(nodes, ch, nullptr);

    // now iterate through al nodes and find those that have not yet
    // been added to the nodegraph (= their parent could not be recognized)
@ -905,7 +926,7 @@ void ASEImporter::ConvertMeshes(ASE::Mesh &mesh, std::vector<aiMesh *> &avOutMes
        ASSIMP_LOG_WARN("Material index is out of range");
    }

-    // If the material the mesh is assigned to consists of submeshes, split it
+    // If the material the mesh is assigned to is consisting of submeshes, split it
    if (!mParser->m_vMaterials[mesh.iMaterialIndex].avSubMaterials.empty()) {
        std::vector<ASE::Material> vSubMaterials = mParser->m_vMaterials[mesh.iMaterialIndex].avSubMaterials;

@ -984,8 +1005,8 @@ void ASEImporter::ConvertMeshes(ASE::Mesh &mesh, std::vector<aiMesh *> &avOutMes
                                            blubb != mesh.mBoneVertices[iIndex2].mBoneWeights.end(); ++blubb) {

                                        // NOTE: illegal cases have already been filtered out
-                                        avOutputBones[(*blubb).first].emplace_back(
-                                                iBase, (*blubb).second);
+                                        avOutputBones[(*blubb).first].push_back(std::pair<unsigned int, float>(
+                                                iBase, (*blubb).second));
                                    }
                                }
                            }
@ -1263,8 +1284,6 @@ bool ASEImporter::GenerateNormals(ASE::Mesh &mesh) {
    return false;
 }

-}
-
 #endif // ASSIMP_BUILD_NO_3DS_IMPORTER

 #endif // !! ASSIMP_BUILD_NO_BASE_IMPORTER
--- a/code/AssetLib/ASE/ASELoader.h
+++ b/code/AssetLib/ASE/ASELoader.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -62,7 +62,7 @@ namespace Assimp {
 class ASEImporter : public BaseImporter {
 public:
    ASEImporter();
-    ~ASEImporter() override = default;
+    ~ASEImporter() override;

    // -------------------------------------------------------------------
    /** Returns whether the class can handle the format of the given file.
@ -153,13 +153,13 @@ private:
     *  \param matrix Current transform
     */
    void AddNodes(const std::vector<ASE::BaseNode*>& nodes,
-        aiNode* pcParent, const std::string &name);
+        aiNode* pcParent,const char* szName);

    void AddNodes(const std::vector<ASE::BaseNode*>& nodes,
-        aiNode* pcParent, const std::string &name,
+        aiNode* pcParent,const char* szName,
        const aiMatrix4x4& matrix);

-    void AddMeshes(const ASE::BaseNode* snode, aiNode* node);
+    void AddMeshes(const ASE::BaseNode* snode,aiNode* node);

    // -------------------------------------------------------------------
    /** Generate a default material and add it to the parser's list
@ -188,4 +188,5 @@ protected:

 } // end of namespace Assimp

+
 #endif // AI_3DSIMPORTER_H_INC
--- a/code/AssetLib/ASE/ASEParser.cpp
+++ b/code/AssetLib/ASE/ASEParser.cpp
--- a/code/AssetLib/ASE/ASEParser.h
+++ b/code/AssetLib/ASE/ASEParser.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team
+

 All rights reserved.

@ -115,7 +116,7 @@ struct Material : public D3DS::Material {
        return *this;
    }

-    ~Material() = default;
+    ~Material() {}

    //! Contains all sub materials of this material
    std::vector<Material> avSubMaterials;
@ -384,18 +385,20 @@ struct Dummy : public BaseNode {
 /** \brief Class to parse ASE files
 */
 class Parser {
-public:
-    /// @brief No default constructor.
-    Parser() = delete;
+private:
+    Parser() AI_NO_EXCEPT {
+        // empty
+    }

+public:
    // -------------------------------------------------------------------
    //! Construct a parser from a given input file which is
    //! guaranteed to be terminated with zero.
-    //! @param file              The name of the input file.
+    //! @param szFile Input file
    //! @param fileFormatDefault Assumed file format version. If the
    //!   file format is specified in the file the new value replaces
    //!   the default value.
-    Parser(const char *file, size_t fileLen, unsigned int fileFormatDefault);
+    Parser(const char *szFile, unsigned int fileFormatDefault);

    // -------------------------------------------------------------------
    //! Parses the file into the parsers internal representation
@ -553,15 +556,13 @@ private:
    //! (also works for MESH_TVERT, MESH_CFACE, MESH_VERTCOL  ...)
    //! \param apOut Output buffer (3 floats)
    //! \param rIndexOut Output index
-    void ParseLV4MeshRealTriple(ai_real *apOut, unsigned int &rIndexOut);
-    void ParseLV4MeshFloatTriple(float *apOut, unsigned int &rIndexOut);
+    void ParseLV4MeshFloatTriple(ai_real *apOut, unsigned int &rIndexOut);

    // -------------------------------------------------------------------
    //! Parse a *MESH_VERT block in a file
    //! (also works for MESH_TVERT, MESH_CFACE, MESH_VERTCOL  ...)
    //! \param apOut Output buffer (3 floats)
-    void ParseLV4MeshRealTriple(ai_real *apOut);
-    void ParseLV4MeshFloatTriple(float *apOut);
+    void ParseLV4MeshFloatTriple(ai_real *apOut);

    // -------------------------------------------------------------------
    //! Parse a *MESH_TFACE block in a file
@ -579,8 +580,7 @@ private:
    // -------------------------------------------------------------------
    //! Parse a single float element
    //! \param fOut Output float
-    void ParseLV4MeshReal(ai_real &fOut);
-    void ParseLV4MeshFloat(float &fOut);
+    void ParseLV4MeshFloat(ai_real &fOut);

    // -------------------------------------------------------------------
    //! Parse a single int element
@ -620,8 +620,8 @@ private:
    bool ParseString(std::string &out, const char *szName);

 public:
-    const char *mFilePtr; ////< Pointer to current data
-    const char *mEnd;     ///< The end pointer of the file data
+    //! Pointer to current data
+    const char *filePtr;

    //! background color to be passed to the viewer
    //! QNAN if none was found
--- a/code/AssetLib/Assbin/AssbinExporter.cpp
+++ b/code/AssetLib/Assbin/AssbinExporter.cpp
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

--- a/code/AssetLib/Assbin/AssbinExporter.h
+++ b/code/AssetLib/Assbin/AssbinExporter.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -56,5 +56,5 @@ namespace Assimp {
 void ASSIMP_API ExportSceneAssbin(const char* pFile, IOSystem* pIOSystem, const aiScene* pScene, const ExportProperties* /*pProperties*/);

 }
-#endif
+#endif 
 #endif // AI_ASSBINEXPORTER_H_INC
--- a/code/AssetLib/Assbin/AssbinFileWriter.cpp
+++ b/code/AssetLib/Assbin/AssbinFileWriter.cpp
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -50,7 +50,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/version.h>
 #include <assimp/IOStream.hpp>

-#include "zlib.h"
+#ifdef ASSIMP_BUILD_NO_OWN_ZLIB
+#include <zlib.h>
+#else
+#include "../contrib/zlib/zlib.h"
+#endif

 #include <ctime>

@ -126,7 +130,7 @@ inline size_t Write<double>(IOStream *stream, const double &f) {
 // Serialize a vec3
 template <>
 inline size_t Write<aiVector3D>(IOStream *stream, const aiVector3D &v) {
-    size_t t = Write<ai_real>(stream, v.x);
+    size_t t = Write<float>(stream, v.x);
    t += Write<float>(stream, v.y);
    t += Write<float>(stream, v.z);

@ -137,7 +141,7 @@ inline size_t Write<aiVector3D>(IOStream *stream, const aiVector3D &v) {
 // Serialize a color value
 template <>
 inline size_t Write<aiColor3D>(IOStream *stream, const aiColor3D &v) {
-    size_t t = Write<ai_real>(stream, v.r);
+    size_t t = Write<float>(stream, v.r);
    t += Write<float>(stream, v.g);
    t += Write<float>(stream, v.b);

@ -148,7 +152,7 @@ inline size_t Write<aiColor3D>(IOStream *stream, const aiColor3D &v) {
 // Serialize a color value
 template <>
 inline size_t Write<aiColor4D>(IOStream *stream, const aiColor4D &v) {
-    size_t t = Write<ai_real>(stream, v.r);
+    size_t t = Write<float>(stream, v.r);
    t += Write<float>(stream, v.g);
    t += Write<float>(stream, v.b);
    t += Write<float>(stream, v.a);
@ -160,7 +164,7 @@ inline size_t Write<aiColor4D>(IOStream *stream, const aiColor4D &v) {
 // Serialize a quaternion
 template <>
 inline size_t Write<aiQuaternion>(IOStream *stream, const aiQuaternion &v) {
-    size_t t = Write<ai_real>(stream, v.w);
+    size_t t = Write<float>(stream, v.w);
    t += Write<float>(stream, v.x);
    t += Write<float>(stream, v.y);
    t += Write<float>(stream, v.z);
@ -186,7 +190,7 @@ template <>
 inline size_t Write<aiMatrix4x4>(IOStream *stream, const aiMatrix4x4 &m) {
    for (unsigned int i = 0; i < 4; ++i) {
        for (unsigned int i2 = 0; i2 < 4; ++i2) {
-            Write<ai_real>(stream, m[i][i2]);
+            Write<float>(stream, m[i][i2]);
        }
    }

@ -287,15 +291,15 @@ public:
    size_t Read(void * /*pvBuffer*/, size_t /*pSize*/, size_t /*pCount*/) override {
        return 0;
    }
-
+    
    aiReturn Seek(size_t /*pOffset*/, aiOrigin /*pOrigin*/) override {
        return aiReturn_FAILURE;
    }
-
+    
    size_t Tell() const override {
        return cursor;
    }
-
+    
    void Flush() override {
        // not implemented
    }
@ -638,10 +642,6 @@ protected:
        Write<aiString>(&chunk, l->mName);
        Write<unsigned int>(&chunk, l->mType);

-        Write<aiVector3D>(&chunk, l->mPosition);
-        Write<aiVector3D>(&chunk, l->mDirection);
-        Write<aiVector3D>(&chunk, l->mUp);
-
        if (l->mType != aiLightSource_DIRECTIONAL) {
            Write<float>(&chunk, l->mAttenuationConstant);
            Write<float>(&chunk, l->mAttenuationLinear);
--- a/code/AssetLib/Assbin/AssbinFileWriter.h
+++ b/code/AssetLib/Assbin/AssbinFileWriter.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

--- a/code/AssetLib/Assbin/AssbinLoader.cpp
+++ b/code/AssetLib/Assbin/AssbinLoader.cpp
@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -65,7 +65,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 using namespace Assimp;

-static constexpr aiImporterDesc desc = {
+static const aiImporterDesc desc = {
    "Assimp Binary Importer",
    "Gargaj / Conspiracy",
    "",
@ -556,10 +556,6 @@ void AssbinImporter::ReadBinaryLight(IOStream *stream, aiLight *l) {
    l->mName = Read<aiString>(stream);
    l->mType = (aiLightSourceType)Read<unsigned int>(stream);

-    l->mPosition = Read<aiVector3D>(stream);
-    l->mDirection = Read<aiVector3D>(stream);
-    l->mUp = Read<aiVector3D>(stream);
-
    if (l->mType != aiLightSource_DIRECTIONAL) {
        l->mAttenuationConstant = Read<float>(stream);
        l->mAttenuationLinear = Read<float>(stream);
--- a/code/AssetLib/Assbin/AssbinLoader.h
+++ b/code/AssetLib/Assbin/AssbinLoader.h
@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

--- a/code/AssetLib/Assjson/cencode.c
+++ b/code/AssetLib/Assjson/cencode.c
@ -7,7 +7,7 @@ For details, see http://sourceforge.net/projects/libb64

 #include "cencode.h" // changed from <B64/cencode.h>

-static const int CHARS_PER_LINE = 72;
+const int CHARS_PER_LINE = 72;

 #ifdef _MSC_VER
 #pragma warning(push)
--- a/code/AssetLib/Assjson/json_exporter.cpp
+++ b/code/AssetLib/Assjson/json_exporter.cpp
@ -10,7 +10,6 @@ Licensed under a 3-clause BSD license. See the LICENSE file for more information
 #ifndef ASSIMP_BUILD_NO_ASSJSON_EXPORTER

 #include <assimp/scene.h>
-#include <assimp/ai_assert.h>
 #include <assimp/Exporter.hpp>
 #include <assimp/IOStream.hpp>
 #include <assimp/IOSystem.hpp>
@ -24,15 +23,16 @@ Licensed under a 3-clause BSD license. See the LICENSE file for more information

 #define CURRENT_FORMAT_VERSION 100

+// grab scoped_ptr from assimp to avoid a dependency on boost.
+//#include <assimp/../../code/BoostWorkaround/boost/scoped_ptr.hpp>
+
 #include "mesh_splitter.h"

 extern "C" {
-#   include "cencode.h"
+#include "cencode.h"
 }
-
 namespace Assimp {

-// Forward declarations
 void ExportAssimp2Json(const char *, Assimp::IOSystem *, const aiScene *, const Assimp::ExportProperties *);

 // small utility class to simplify serializing the aiScene to Json
@ -43,7 +43,7 @@ public:
        Flag_WriteSpecialFloats = 0x2,
        Flag_SkipWhitespaces = 0x4
    };
-
+    
    JSONWriter(Assimp::IOStream &out, unsigned int flags = 0u) :
            out(out), indent (""), newline("\n"), space(" "), buff (), first(false), flags(flags) {
        // make sure that all formatting happens using the standard, C locale and not the user's current locale
@ -179,6 +179,7 @@ private:
        // escape backslashes and single quotes, both would render the JSON invalid if left as is
        t.reserve(s.length);
        for (size_t i = 0; i < s.length; ++i) {
+
            if (s.data[i] == '\\' || s.data[i] == '\'' || s.data[i] == '\"') {
                t.push_back('\\');
            }
@ -240,7 +241,7 @@ private:
    unsigned int flags;
 };

-static void Write(JSONWriter &out, const aiVector3D &ai, bool is_elem = true) {
+void Write(JSONWriter &out, const aiVector3D &ai, bool is_elem = true) {
    out.StartArray(is_elem);
    out.Element(ai.x);
    out.Element(ai.y);
@ -248,7 +249,7 @@ static void Write(JSONWriter &out, const aiVector3D &ai, bool is_elem = true) {
    out.EndArray();
 }

-static void Write(JSONWriter &out, const aiQuaternion &ai, bool is_elem = true) {
+void Write(JSONWriter &out, const aiQuaternion &ai, bool is_elem = true) {
    out.StartArray(is_elem);
    out.Element(ai.w);
    out.Element(ai.x);
@ -257,7 +258,7 @@ static void Write(JSONWriter &out, const aiQuaternion &ai, bool is_elem = true)
    out.EndArray();
 }

-static void Write(JSONWriter &out, const aiColor3D &ai, bool is_elem = true) {
+void Write(JSONWriter &out, const aiColor3D &ai, bool is_elem = true) {
    out.StartArray(is_elem);
    out.Element(ai.r);
    out.Element(ai.g);
@ -265,7 +266,7 @@ static void Write(JSONWriter &out, const aiColor3D &ai, bool is_elem = true) {
    out.EndArray();
 }

-static void Write(JSONWriter &out, const aiMatrix4x4 &ai, bool is_elem = true) {
+void Write(JSONWriter &out, const aiMatrix4x4 &ai, bool is_elem = true) {
    out.StartArray(is_elem);
    for (unsigned int x = 0; x < 4; ++x) {
        for (unsigned int y = 0; y < 4; ++y) {
@ -275,7 +276,7 @@ static void Write(JSONWriter &out, const aiMatrix4x4 &ai, bool is_elem = true) {
    out.EndArray();
 }

-static void Write(JSONWriter &out, const aiBone &ai, bool is_elem = true) {
+void Write(JSONWriter &out, const aiBone &ai, bool is_elem = true) {
    out.StartObj(is_elem);

    out.Key("name");
@ -296,7 +297,7 @@ static void Write(JSONWriter &out, const aiBone &ai, bool is_elem = true) {
    out.EndObj();
 }

-static void Write(JSONWriter &out, const aiFace &ai, bool is_elem = true) {
+void Write(JSONWriter &out, const aiFace &ai, bool is_elem = true) {
    out.StartArray(is_elem);
    for (unsigned int i = 0; i < ai.mNumIndices; ++i) {
        out.Element(ai.mIndices[i]);
@ -304,7 +305,7 @@ static void Write(JSONWriter &out, const aiFace &ai, bool is_elem = true) {
    out.EndArray();
 }

-static void Write(JSONWriter &out, const aiMesh &ai, bool is_elem = true) {
+void Write(JSONWriter &out, const aiMesh &ai, bool is_elem = true) {
    out.StartObj(is_elem);

    out.Key("name");
@ -415,7 +416,7 @@ static void Write(JSONWriter &out, const aiMesh &ai, bool is_elem = true) {
    out.EndObj();
 }

-static void Write(JSONWriter &out, const aiNode &ai, bool is_elem = true) {
+void Write(JSONWriter &out, const aiNode &ai, bool is_elem = true) {
    out.StartObj(is_elem);

    out.Key("name");
@ -445,7 +446,7 @@ static void Write(JSONWriter &out, const aiNode &ai, bool is_elem = true) {
    out.EndObj();
 }

-static void Write(JSONWriter &out, const aiMaterial &ai, bool is_elem = true) {
+void Write(JSONWriter &out, const aiMaterial &ai, bool is_elem = true) {
    out.StartObj(is_elem);

    out.Key("properties");
@ -465,55 +466,41 @@ static void Write(JSONWriter &out, const aiMaterial &ai, bool is_elem = true) {

        out.Key("value");
        switch (prop->mType) {
-            case aiPTI_Float:
-                if (prop->mDataLength / sizeof(float) > 1) {
-                    out.StartArray();
-                    for (unsigned int ii = 0; ii < prop->mDataLength / sizeof(float); ++ii) {
-                        out.Element(reinterpret_cast<float *>(prop->mData)[ii]);
-                    }
-                    out.EndArray();
-                } else {
-                    out.SimpleValue(*reinterpret_cast<float *>(prop->mData));
+        case aiPTI_Float:
+            if (prop->mDataLength / sizeof(float) > 1) {
+                out.StartArray();
+                for (unsigned int ii = 0; ii < prop->mDataLength / sizeof(float); ++ii) {
+                    out.Element(reinterpret_cast<float *>(prop->mData)[ii]);
                }
-                break;
-            case aiPTI_Double:
-                if (prop->mDataLength / sizeof(double) > 1) {
-                    out.StartArray();
-                    for (unsigned int ii = 0; ii < prop->mDataLength / sizeof(double); ++ii) {
-                        out.Element(reinterpret_cast<double*>(prop->mData)[ii]);
-                    }
-                    out.EndArray();
-                } else {
-                    out.SimpleValue(*reinterpret_cast<double*>(prop->mData));
-                }
-                break;
-            case aiPTI_Integer:
-                if (prop->mDataLength / sizeof(int) > 1) {
-                    out.StartArray();
-                    for (unsigned int ii = 0; ii < prop->mDataLength / sizeof(int); ++ii) {
-                        out.Element(reinterpret_cast<int *>(prop->mData)[ii]);
-                    }
-                    out.EndArray();
-                } else {
-                    out.SimpleValue(*reinterpret_cast<int *>(prop->mData));
-                }
-                break;
+                out.EndArray();
+            } else {
+                out.SimpleValue(*reinterpret_cast<float *>(prop->mData));
+            }
+            break;

-            case aiPTI_String:
-                {
-                    aiString s;
-                    aiGetMaterialString(&ai, prop->mKey.data, prop->mSemantic, prop->mIndex, &s);
-                    out.SimpleValue(s);
+        case aiPTI_Integer:
+            if (prop->mDataLength / sizeof(int) > 1) {
+                out.StartArray();
+                for (unsigned int ii = 0; ii < prop->mDataLength / sizeof(int); ++ii) {
+                    out.Element(reinterpret_cast<int *>(prop->mData)[ii]);
                }
-                break;
-            case aiPTI_Buffer:
-                {
-                    // binary data is written as series of hex-encoded octets
-                    out.SimpleValue(prop->mData, prop->mDataLength);
-                }
-                break;
-            default:
-                ai_assert(false);
+                out.EndArray();
+            } else {
+                out.SimpleValue(*reinterpret_cast<int *>(prop->mData));
+            }
+            break;
+
+        case aiPTI_String: {
+            aiString s;
+            aiGetMaterialString(&ai, prop->mKey.data, prop->mSemantic, prop->mIndex, &s);
+            out.SimpleValue(s);
+        } break;
+        case aiPTI_Buffer: {
+            // binary data is written as series of hex-encoded octets
+            out.SimpleValue(prop->mData, prop->mDataLength);
+        } break;
+        default:
+            assert(false);
        }

        out.EndObj();
@ -523,7 +510,7 @@ static void Write(JSONWriter &out, const aiMaterial &ai, bool is_elem = true) {
    out.EndObj();
 }

-static void Write(JSONWriter &out, const aiTexture &ai, bool is_elem = true) {
+void Write(JSONWriter &out, const aiTexture &ai, bool is_elem = true) {
    out.StartObj(is_elem);

    out.Key("width");
@ -559,7 +546,7 @@ static void Write(JSONWriter &out, const aiTexture &ai, bool is_elem = true) {
    out.EndObj();
 }

-static void Write(JSONWriter &out, const aiLight &ai, bool is_elem = true) {
+void Write(JSONWriter &out, const aiLight &ai, bool is_elem = true) {
    out.StartObj(is_elem);

    out.Key("name");
@ -607,7 +594,7 @@ static void Write(JSONWriter &out, const aiLight &ai, bool is_elem = true) {
    out.EndObj();
 }

-static void Write(JSONWriter &out, const aiNodeAnim &ai, bool is_elem = true) {
+void Write(JSONWriter &out, const aiNodeAnim &ai, bool is_elem = true) {
    out.StartObj(is_elem);

    out.Key("name");
@ -660,7 +647,7 @@ static void Write(JSONWriter &out, const aiNodeAnim &ai, bool is_elem = true) {
    out.EndObj();
 }

-static void Write(JSONWriter &out, const aiAnimation &ai, bool is_elem = true) {
+void Write(JSONWriter &out, const aiAnimation &ai, bool is_elem = true) {
    out.StartObj(is_elem);

    out.Key("name");
@ -681,7 +668,7 @@ static void Write(JSONWriter &out, const aiAnimation &ai, bool is_elem = true) {
    out.EndObj();
 }

-static void Write(JSONWriter &out, const aiCamera &ai, bool is_elem = true) {
+void Write(JSONWriter &out, const aiCamera &ai, bool is_elem = true) {
    out.StartObj(is_elem);

    out.Key("name");
@ -708,7 +695,7 @@ static void Write(JSONWriter &out, const aiCamera &ai, bool is_elem = true) {
    out.EndObj();
 }

-static void WriteFormatInfo(JSONWriter &out) {
+void WriteFormatInfo(JSONWriter &out) {
    out.StartObj();
    out.Key("format");
    out.SimpleValue("\"assimp2json\"");
@ -717,7 +704,7 @@ static void WriteFormatInfo(JSONWriter &out) {
    out.EndObj();
 }

-static void Write(JSONWriter &out, const aiScene &ai) {
+void Write(JSONWriter &out, const aiScene &ai) {
    out.StartObj();

    out.Key("__metadata__");
--- a/code/AssetLib/Assjson/mesh_splitter.cpp
+++ b/code/AssetLib/Assjson/mesh_splitter.cpp
@ -304,7 +304,7 @@ void MeshSplitter :: SplitMesh(unsigned int a, aiMesh* in_mesh, std::vector<std:
 		}

 		// add the newly created mesh to the list
-		source_mesh_map.emplace_back(out_mesh,a);
+		source_mesh_map.push_back(std::make_pair(out_mesh,a));

 		if (base == in_mesh->mNumFaces) {
 			break;
--- a/code/AssetLib/Assxml/AssxmlExporter.cpp
+++ b/code/AssetLib/Assxml/AssxmlExporter.cpp
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team


 All rights reserved.
--- a/code/AssetLib/Assxml/AssxmlExporter.h
+++ b/code/AssetLib/Assxml/AssxmlExporter.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team


 All rights reserved.
--- a/code/AssetLib/Assxml/AssxmlFileWriter.cpp
+++ b/code/AssetLib/Assxml/AssxmlFileWriter.cpp
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team


 All rights reserved.
@ -652,7 +652,7 @@ void DumpSceneToAssxml(
        const char *pFile, const char *cmd, IOSystem *pIOSystem,
        const aiScene *pScene, bool shortened) {
    std::unique_ptr<IOStream> file(pIOSystem->Open(pFile, "wt"));
-    if (!file) {
+    if (!file.get()) {
        throw std::runtime_error("Unable to open output file " + std::string(pFile) + '\n');
    }

--- a/code/AssetLib/Assxml/AssxmlFileWriter.h
+++ b/code/AssetLib/Assxml/AssxmlFileWriter.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

--- a/code/AssetLib/B3D/B3DImporter.cpp
+++ b/code/AssetLib/B3D/B3DImporter.cpp
@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -59,10 +59,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #include <memory>

-namespace Assimp {
+using namespace Assimp;
 using namespace std;

-static constexpr aiImporterDesc desc = {
+static const aiImporterDesc desc = {
    "BlitzBasic 3D Importer",
    "",
    "",
@ -79,16 +79,18 @@ static constexpr aiImporterDesc desc = {
 #pragma warning(disable : 4018)
 #endif

-// #define DEBUG_B3D
+//#define DEBUG_B3D

-template <typename T>
+template<typename T>
 void DeleteAllBarePointers(std::vector<T> &x) {
    for (auto p : x) {
        delete p;
    }
 }

-B3DImporter::~B3DImporter() = default;
+B3DImporter::~B3DImporter() {
+    // empty
+}

 // ------------------------------------------------------------------------------------------------
 bool B3DImporter::CanRead(const std::string &pFile, IOSystem * /*pIOHandler*/, bool /*checkSig*/) const {
@ -116,7 +118,7 @@ void B3DImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
    std::unique_ptr<IOStream> file(pIOHandler->Open(pFile));

    // Check whether we can read from the file
-    if (file == nullptr) {
+    if (file.get() == nullptr) {
        throw DeadlyImportError("Failed to open B3D file ", pFile, ".");
    }

@ -150,7 +152,7 @@ AI_WONT_RETURN void B3DImporter::Fail(const string &str) {

 // ------------------------------------------------------------------------------------------------
 int B3DImporter::ReadByte() {
-    if (_pos >= _buf.size()) {
+    if (_pos > _buf.size()) {
        Fail("EOF");
    }

@ -253,7 +255,7 @@ size_t B3DImporter::ChunkSize() {
 template <class T>
 T *B3DImporter::to_array(const vector<T> &v) {
    if (v.empty()) {
-        return nullptr;
+        return 0;
    }
    T *p = new T[v.size()];
    for (size_t i = 0; i < v.size(); ++i) {
@ -266,7 +268,7 @@ T *B3DImporter::to_array(const vector<T> &v) {
 template <class T>
 T **unique_to_array(vector<std::unique_ptr<T>> &v) {
    if (v.empty()) {
-        return nullptr;
+        return 0;
    }
    T **p = new T *[v.size()];
    for (size_t i = 0; i < v.size(); ++i) {
@ -329,7 +331,7 @@ void B3DImporter::ReadBRUS() {
            mat->AddProperty(&i, 1, AI_MATKEY_TWOSIDED);
        }

-        // Textures
+        //Textures
        for (int i = 0; i < n_texs; ++i) {
            int texid = ReadInt();
            if (texid < -1 || (texid >= 0 && texid >= static_cast<int>(_textures.size()))) {
@ -372,7 +374,7 @@ void B3DImporter::ReadVRTS() {
        }

        if (_vflags & 2) {
-            ReadQuat(); // skip v 4bytes...
+            ReadQuat(); //skip v 4bytes...
        }

        for (int j = 0; j < _tcsets; ++j) {
@ -418,6 +420,7 @@ void B3DImporter::ReadTRIS(int v0) {
            ASSIMP_LOG_ERROR("Bad triangle index: i0=", i0, ", i1=", i1, ", i2=", i2);
 #endif
            Fail("Bad triangle index");
+            continue;
        }
        face->mNumIndices = 3;
        face->mIndices = new unsigned[3];
@ -476,13 +479,13 @@ void B3DImporter::ReadKEYS(aiNodeAnim *nodeAnim) {
    while (ChunkSize()) {
        int frame = ReadInt();
        if (flags & 1) {
-            trans.emplace_back(frame, ReadVec3());
+            trans.push_back(aiVectorKey(frame, ReadVec3()));
        }
        if (flags & 2) {
-            scale.emplace_back(frame, ReadVec3());
+            scale.push_back(aiVectorKey(frame, ReadVec3()));
        }
        if (flags & 4) {
-            rot.emplace_back(frame, ReadQuat());
+            rot.push_back(aiQuatKey(frame, ReadQuat()));
        }
    }

@ -616,7 +619,7 @@ void B3DImporter::ReadBB3D(aiScene *scene) {
            } else if (chunk == "BRUS") {
                ReadBRUS();
            } else if (chunk == "NODE") {
-                ReadNODE(nullptr);
+                ReadNODE(0);
            }
            ExitChunk();
        }
@ -641,7 +644,7 @@ void B3DImporter::ReadBB3D(aiScene *scene) {
            int n_tris = mesh->mNumFaces;
            int n_verts = mesh->mNumVertices = n_tris * 3;

-            aiVector3D *mv = mesh->mVertices = new aiVector3D[n_verts], *mn = nullptr, *mc = nullptr;
+            aiVector3D *mv = mesh->mVertices = new aiVector3D[n_verts], *mn = 0, *mc = 0;
            if (_vflags & 1) {
                mn = mesh->mNormals = new aiVector3D[n_verts];
            }
@ -670,7 +673,7 @@ void B3DImporter::ReadBB3D(aiScene *scene) {
                        int bone = v.bones[k];
                        float weight = v.weights[k];

-                        vweights[bone].emplace_back(vertIdx + faceIndex, weight);
+                        vweights[bone].push_back(aiVertexWeight(vertIdx + faceIndex, weight));
                    }
                }
                ++face;
@ -704,22 +707,22 @@ void B3DImporter::ReadBB3D(aiScene *scene) {
        }
    }

-    // nodes
+    //nodes
    scene->mRootNode = _nodes[0];
    _nodes.clear(); // node ownership now belongs to scene

-    // material
+    //material
    if (!_materials.size()) {
        _materials.emplace_back(std::unique_ptr<aiMaterial>(new aiMaterial));
    }
    scene->mNumMaterials = static_cast<unsigned int>(_materials.size());
    scene->mMaterials = unique_to_array(_materials);

-    // meshes
+    //meshes
    scene->mNumMeshes = static_cast<unsigned int>(_meshes.size());
    scene->mMeshes = unique_to_array(_meshes);

-    // animations
+    //animations
    if (_animations.size() == 1 && _nodeAnims.size()) {

        aiAnimation *anim = _animations.back().get();
@ -738,6 +741,4 @@ void B3DImporter::ReadBB3D(aiScene *scene) {
    flip.Execute(scene);
 }

-} // namespace Assimp
-
 #endif // !! ASSIMP_BUILD_NO_B3D_IMPORTER
--- a/code/AssetLib/B3D/B3DImporter.h
+++ b/code/AssetLib/B3D/B3DImporter.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

--- a/code/AssetLib/BVH/BVHLoader.cpp
+++ b/code/AssetLib/BVH/BVHLoader.cpp
@ -4,7 +4,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team



@ -55,11 +55,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <map>
 #include <memory>

-namespace Assimp {
-
+using namespace Assimp;
 using namespace Assimp::Formatter;

-static constexpr aiImporterDesc desc = {
+static const aiImporterDesc desc = {
    "BVH Importer (MoCap)",
    "",
    "",
@ -74,8 +73,8 @@ static constexpr aiImporterDesc desc = {

 // ------------------------------------------------------------------------------------------------
 // Aborts the file reading with an exception
-template <typename... T>
-AI_WONT_RETURN void BVHLoader::ThrowException(T &&...args) {
+template<typename... T>
+AI_WONT_RETURN void BVHLoader::ThrowException(T&&... args) {
    throw DeadlyImportError(mFileName, ":", mLine, " - ", args...);
 }

@ -89,7 +88,7 @@ BVHLoader::BVHLoader() :

 // ------------------------------------------------------------------------------------------------
 // Destructor, private as well
-BVHLoader::~BVHLoader() = default;
+BVHLoader::~BVHLoader() {}

 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
@ -116,7 +115,7 @@ void BVHLoader::InternReadFile(const std::string &pFile, aiScene *pScene, IOSyst

    // read file into memory
    std::unique_ptr<IOStream> file(pIOHandler->Open(pFile));
-    if (file == nullptr) {
+    if (file.get() == nullptr) {
        throw DeadlyImportError("Failed to open file ", pFile, ".");
    }

@ -187,12 +186,12 @@ aiNode *BVHLoader::ReadNode() {
    std::vector<aiNode *> childNodes;

    // and create an bone entry for it
-    mNodes.emplace_back(node);
+    mNodes.push_back(Node(node));
    Node &internNode = mNodes.back();

    // now read the node's contents
    std::string siteToken;
-    while (true) {
+    while (1) {
        std::string token = GetNextToken();

        // node offset to parent node
@ -248,7 +247,7 @@ aiNode *BVHLoader::ReadEndSite(const std::string &pParentName) {

    // now read the node's contents. Only possible entry is "OFFSET"
    std::string token;
-    while (true) {
+    while (1) {
        token.clear();
        token = GetNextToken();

@ -427,7 +426,7 @@ void BVHLoader::CreateAnimation(aiScene *pScene) {
        nodeAnim->mNodeName.Set(nodeName);
        std::map<BVHLoader::ChannelType, int> channelMap;

-        // Build map of channels
+        //Build map of channels
        for (unsigned int channel = 0; channel < node.mChannels.size(); ++channel) {
            channelMap[node.mChannels[channel]] = channel;
        }
@ -442,7 +441,7 @@ void BVHLoader::CreateAnimation(aiScene *pScene) {

                // Now compute all translations
                for (BVHLoader::ChannelType channel = Channel_PositionX; channel <= Channel_PositionZ; channel = (BVHLoader::ChannelType)(channel + 1)) {
-                    // Find channel in node
+                    //Find channel in node
                    std::map<BVHLoader::ChannelType, int>::iterator mapIter = channelMap.find(channel);

                    if (mapIter == channelMap.end())
@ -486,27 +485,30 @@ void BVHLoader::CreateAnimation(aiScene *pScene) {
            for (unsigned int fr = 0; fr < mAnimNumFrames; ++fr) {
                aiMatrix4x4 temp;
                aiMatrix3x3 rotMatrix;
-                for (unsigned int channelIdx = 0; channelIdx < node.mChannels.size(); ++channelIdx) {
-                    switch (node.mChannels[channelIdx]) {
-                    case Channel_RotationX: {
+				for (unsigned int channelIdx = 0; channelIdx < node.mChannels.size(); ++ channelIdx) {
+					switch (node.mChannels[channelIdx]) {
+                    case Channel_RotationX:
+                        {
                        const float angle = node.mChannelValues[fr * node.mChannels.size() + channelIdx] * float(AI_MATH_PI) / 180.0f;
-                        aiMatrix4x4::RotationX(angle, temp);
-                        rotMatrix *= aiMatrix3x3(temp);
-                    } break;
-                    case Channel_RotationY: {
+                        aiMatrix4x4::RotationX( angle, temp); rotMatrix *= aiMatrix3x3( temp);
+                        }
+                        break;
+                    case Channel_RotationY:
+                        {
                        const float angle = node.mChannelValues[fr * node.mChannels.size() + channelIdx] * float(AI_MATH_PI) / 180.0f;
-                        aiMatrix4x4::RotationY(angle, temp);
-                        rotMatrix *= aiMatrix3x3(temp);
-                    } break;
-                    case Channel_RotationZ: {
+                        aiMatrix4x4::RotationY( angle, temp); rotMatrix *= aiMatrix3x3( temp);
+                        }
+                        break;
+                    case Channel_RotationZ:
+                        {
                        const float angle = node.mChannelValues[fr * node.mChannels.size() + channelIdx] * float(AI_MATH_PI) / 180.0f;
-                        aiMatrix4x4::RotationZ(angle, temp);
-                        rotMatrix *= aiMatrix3x3(temp);
-                    } break;
+                        aiMatrix4x4::RotationZ( angle, temp); rotMatrix *= aiMatrix3x3( temp);
+                        }
+                        break;
                    default:
                        break;
-                    }
-                }
+					}
+				}
                rotkey->mTime = double(fr);
                rotkey->mValue = aiQuaternion(rotMatrix);
                ++rotkey;
@ -523,6 +525,4 @@ void BVHLoader::CreateAnimation(aiScene *pScene) {
    }
 }

-} // namespace Assimp
-
 #endif // !! ASSIMP_BUILD_NO_BVH_IMPORTER
--- a/code/AssetLib/BVH/BVHLoader.h
+++ b/code/AssetLib/BVH/BVHLoader.h
@ -4,7 +4,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team


 All rights reserved.
--- a/code/AssetLib/Blender/BlenderBMesh.cpp
+++ b/code/AssetLib/Blender/BlenderBMesh.cpp
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team
 All rights reserved.

 Redistribution and use of this software in source and binary forms,
@ -52,7 +52,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 namespace Assimp {
 template <>
 const char *LogFunctions<BlenderBMeshConverter>::Prefix() {
-    return "BLEND_BMESH: ";
+    static auto prefix = "BLEND_BMESH: ";
+    return prefix;
 }
 } // namespace Assimp

@ -139,7 +140,7 @@ void BlenderBMeshConverter::ConvertPolyToFaces(const MPoly &poly) {
                ThrowException("BMesh uv loop array has incorrect size");
            }
            const MLoopUV *loopUV = &BMesh->mloopuv[poly.loopstart];
-            AddTFace(loopUV[0].uv, loopUV[1].uv, loopUV[2].uv, poly.totloop == 4 ? loopUV[3].uv : nullptr);
+            AddTFace(loopUV[0].uv, loopUV[1].uv, loopUV[2].uv, poly.totloop == 4 ? loopUV[3].uv : 0);
        }
    } else if (poly.totloop > 4) {
 #if ASSIMP_BLEND_WITH_GLU_TESSELLATE
--- a/code/AssetLib/Blender/BlenderBMesh.h
+++ b/code/AssetLib/Blender/BlenderBMesh.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team
 All rights reserved.

 Redistribution and use of this software in source and binary forms,
@ -80,7 +80,7 @@ namespace Assimp
        void DestroyTriMesh( );
        void ConvertPolyToFaces( const Blender::MPoly& poly );
        void AddFace( int v1, int v2, int v3, int v4 = 0 );
-        void AddTFace(const float *uv1, const float *uv2, const float *uv3, const float *uv4 = nullptr);
+        void AddTFace( const float* uv1, const float* uv2, const float *uv3, const float* uv4 = 0 );

        const Blender::Mesh* BMesh;
        Blender::Mesh* triMesh;
--- a/code/AssetLib/Blender/BlenderCustomData.cpp
+++ b/code/AssetLib/Blender/BlenderCustomData.cpp
@ -96,8 +96,7 @@ struct CustomDataTypeDescription {
        *           other (like CD_ORCO, ...) uses arrays of rawtypes or even arrays of Structures
        *           use a special readfunction for that cases
        */
-static std::array<CustomDataTypeDescription, CD_NUMTYPES> customDataTypeDescriptions = { {
-        DECL_STRUCT_CUSTOMDATATYPEDESCRIPTION(MVert),
+std::array<CustomDataTypeDescription, CD_NUMTYPES> customDataTypeDescriptions = { { DECL_STRUCT_CUSTOMDATATYPEDESCRIPTION(MVert),
        DECL_UNSUPPORTED_CUSTOMDATATYPEDESCRIPTION,
        DECL_UNSUPPORTED_CUSTOMDATATYPEDESCRIPTION,
        DECL_STRUCT_CUSTOMDATATYPEDESCRIPTION(MEdge),
--- a/code/AssetLib/Blender/BlenderDNA.cpp
+++ b/code/AssetLib/Blender/BlenderDNA.cpp
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team


 All rights reserved.
@ -72,7 +72,7 @@ struct Type {

 // ------------------------------------------------------------------------------------------------
 void DNAParser::Parse() {
-    StreamReaderAny &stream = *db.reader;
+    StreamReaderAny &stream = *db.reader.get();
    DNA &dna = db.dna;

    if (!match4(stream, "SDNA")) {
--- a/code/AssetLib/Blender/BlenderDNA.h
+++ b/code/AssetLib/Blender/BlenderDNA.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team


 All rights reserved.
@ -106,7 +106,9 @@ struct ElemBase {
        // empty
    }

-    virtual ~ElemBase() = default;
+    virtual ~ElemBase() {
+        // empty
+    }

    /** Type name of the element. The type
     * string points is the `c_str` of the `name` attribute of the
@ -414,10 +416,10 @@ template <>
 struct Structure::_defaultInitializer<ErrorPolicy_Fail> {

    template <typename T>
-    void operator()(T & /*out*/, const char *message = "") {
+    void operator()(T & /*out*/, const char * = "") {
        // obviously, it is crucial that _DefaultInitializer is used
        // only from within a catch clause.
-        throw DeadlyImportError("Constructing BlenderDNA Structure encountered an error: ", message);
+        throw DeadlyImportError("Constructing BlenderDNA Structure encountered an error");
    }
 };

@ -429,17 +431,6 @@ inline bool Structure ::ResolvePointer<std::shared_ptr, ElemBase>(std::shared_pt
        const Field &f,
        bool) const;

-template <> bool Structure :: ResolvePointer<std::shared_ptr,ElemBase>(
-    std::shared_ptr<ElemBase>& out, const Pointer & ptrval,
-    const FileDatabase& db, const Field&, bool) const;
-template <> inline void Structure :: Convert<int>    (int& dest,const FileDatabase& db) const;
-template<> inline void Structure :: Convert<short>  (short& dest,const FileDatabase& db) const;
-template <> inline void Structure :: Convert<char>   (char& dest,const FileDatabase& db) const;
-template <> inline void Structure::Convert<unsigned char>(unsigned char& dest, const FileDatabase& db) const;
-template <> inline void Structure :: Convert<float>  (float& dest,const FileDatabase& db) const;
-template <> inline void Structure :: Convert<double> (double& dest,const FileDatabase& db) const;
-template <> inline void Structure :: Convert<Pointer> (Pointer& dest,const FileDatabase& db) const;
-
 // -------------------------------------------------------------------------------
 /** Represents the full data structure information for a single BLEND file.
 *  This data is extracted from the DNA1 chunk in the file.
--- a/code/AssetLib/Blender/BlenderDNA.inl
+++ b/code/AssetLib/Blender/BlenderDNA.inl
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

--- a/code/AssetLib/Blender/BlenderIntermediate.h
+++ b/code/AssetLib/Blender/BlenderIntermediate.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team


 All rights reserved.
@ -65,7 +65,8 @@ namespace Blender {
    struct TempArray    {
        typedef TCLASS< T*,std::allocator<T*> > mywrap;

-        TempArray() = default;
+        TempArray() {
+        }

        ~TempArray () {
            for(T* elem : arr) {
--- a/code/AssetLib/Blender/BlenderLoader.cpp
+++ b/code/AssetLib/Blender/BlenderLoader.cpp
@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team


 All rights reserved.
@ -63,19 +63,23 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/StringComparison.h>

 #include <cctype>
-#include <memory>
-#include <utility>

 // zlib is needed for compressed blend files
 #ifndef ASSIMP_BUILD_NO_COMPRESSED_BLEND
 #include "Common/Compression.h"
+/* #ifdef ASSIMP_BUILD_NO_OWN_ZLIB
+#    include <zlib.h>
+#  else
+#    include "../contrib/zlib/zlib.h"
+#  endif*/
 #endif

 namespace Assimp {

 template <>
 const char *LogFunctions<BlenderImporter>::Prefix() {
-    return "BLEND: ";
+    static auto prefix = "BLEND: ";
+    return prefix;
 }

 } // namespace Assimp
@ -84,7 +88,7 @@ using namespace Assimp;
 using namespace Assimp::Blender;
 using namespace Assimp::Formatter;

-static constexpr aiImporterDesc blenderDesc = {
+static const aiImporterDesc blenderDesc = {
    "Blender 3D Importer (http://www.blender3d.org)",
    "",
    "",
@ -110,12 +114,15 @@ BlenderImporter::~BlenderImporter() {
    delete modifier_cache;
 }

-static const char Token[] = "BLENDER";
+static const char * const Tokens[] = { "BLENDER" };

 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
 bool BlenderImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /*checkSig*/) const {
-    return ParseMagicToken(pFile, pIOHandler).error.empty();
+    // note: this won't catch compressed files
+    static const char *tokens[] = { "<BLENDER", "blender" };
+
+    return SearchFileHeaderForToken(pIOHandler, pFile, tokens, AI_COUNT_OF(tokens));
 }

 // ------------------------------------------------------------------------------------------------
@ -134,25 +141,67 @@ void BlenderImporter::SetupProperties(const Importer * /*pImp*/) {
 // Imports the given file into the given scene structure.
 void BlenderImporter::InternReadFile(const std::string &pFile,
        aiScene *pScene, IOSystem *pIOHandler) {
+#ifndef ASSIMP_BUILD_NO_COMPRESSED_BLEND
+    std::vector<char> uncompressed;
+#endif
+
    FileDatabase file;
-    StreamOrError streamOrError = ParseMagicToken(pFile, pIOHandler);
-    if (!streamOrError.error.empty()) {
-        ThrowException(streamOrError.error);
+    std::shared_ptr<IOStream> stream(pIOHandler->Open(pFile, "rb"));
+    if (!stream) {
+        ThrowException("Could not open file for reading");
    }
-    std::shared_ptr<IOStream> stream = std::move(streamOrError.stream);

-    char version[4] = { 0 };
-    file.i64bit = (stream->Read(version, 1, 1), version[0] == '-');
-    file.little = (stream->Read(version, 1, 1), version[0] == 'v');
+    char magic[8] = { 0 };
+    stream->Read(magic, 7, 1);
+    if (strcmp(magic, Tokens[0])) {
+        // Check for presence of the gzip header. If yes, assume it is a
+        // compressed blend file and try uncompressing it, else fail. This is to
+        // avoid uncompressing random files which our loader might end up with.
+#ifdef ASSIMP_BUILD_NO_COMPRESSED_BLEND
+        ThrowException("BLENDER magic bytes are missing, is this file compressed (Assimp was built without decompression support)?");
+#else
+        if (magic[0] != 0x1f || static_cast<uint8_t>(magic[1]) != 0x8b) {
+            ThrowException("BLENDER magic bytes are missing, couldn't find GZIP header either");
+        }

-    stream->Read(version, 3, 1);
-    version[3] = '\0';
+        LogDebug("Found no BLENDER magic word but a GZIP header, might be a compressed file");
+        if (magic[2] != 8) {
+            ThrowException("Unsupported GZIP compression method");
+        }

-    LogInfo("Blender version is ", version[0], ".", version + 1,
+        // http://www.gzip.org/zlib/rfc-gzip.html#header-trailer
+        stream->Seek(0L, aiOrigin_SET);
+        std::shared_ptr<StreamReaderLE> reader = std::shared_ptr<StreamReaderLE>(new StreamReaderLE(stream));
+
+        size_t total = 0;
+        Compression compression;
+        if (compression.open(Compression::Format::Binary, Compression::FlushMode::NoFlush, 16 + Compression::MaxWBits)) {
+            total = compression.decompress((unsigned char *)reader->GetPtr(), reader->GetRemainingSize(), uncompressed);
+            compression.close();
+        }
+
+        // replace the input stream with a memory stream
+        stream.reset(new MemoryIOStream(reinterpret_cast<uint8_t *>(uncompressed.data()), total));
+
+        // .. and retry
+        stream->Read(magic, 7, 1);
+        if (strcmp(magic, "BLENDER")) {
+            ThrowException("Found no BLENDER magic word in decompressed GZIP file");
+        }
+#endif
+    }
+
+    file.i64bit = (stream->Read(magic, 1, 1), magic[0] == '-');
+    file.little = (stream->Read(magic, 1, 1), magic[0] == 'v');
+
+    stream->Read(magic, 3, 1);
+    magic[3] = '\0';
+
+    LogInfo("Blender version is ", magic[0], ".", magic + 1,
            " (64bit: ", file.i64bit ? "true" : "false",
            ", little endian: ", file.little ? "true" : "false", ")");

-    ParseBlendFile(file, std::move(stream));
+    ParseBlendFile(file, stream);

    Scene scene;
    ExtractScene(scene, file);
@ -169,7 +218,7 @@ void BlenderImporter::ParseBlendFile(FileDatabase &out, std::shared_ptr<IOStream

    out.entries.reserve(128);
    { // even small BLEND files tend to consist of many file blocks
-        SectionParser parser(*out.reader, out.i64bit);
+        SectionParser parser(*out.reader.get(), out.i64bit);

        // first parse the file in search for the DNA and insert all other sections into the database
        while ((parser.Next(), 1)) {
@ -359,7 +408,7 @@ void BlenderImporter::ResolveImage(aiMaterial *out, const Material *mat, const M
    // check if the file contents are bundled with the BLEND file
    if (img->packedfile) {
        name.data[0] = '*';
-        name.length = 1 + ASSIMP_itoa10(name.data + 1, static_cast<unsigned int>(AI_MAXLEN - 1), static_cast<int32_t>(conv_data.textures->size()));
+        name.length = 1 + ASSIMP_itoa10(name.data + 1, static_cast<unsigned int>(MAXLEN - 1), static_cast<int32_t>(conv_data.textures->size()));

        conv_data.textures->push_back(new aiTexture());
        aiTexture *curTex = conv_data.textures->back();
@ -433,7 +482,7 @@ void BlenderImporter::AddSentinelTexture(aiMaterial *out, const Material *mat, c
    (void)conv_data;

    aiString name;
-    name.length = ai_snprintf(name.data, AI_MAXLEN, "Procedural,num=%i,type=%s", conv_data.sentinel_cnt++,
+    name.length = ai_snprintf(name.data, MAXLEN, "Procedural,num=%i,type=%s", conv_data.sentinel_cnt++,
            GetTextureTypeDisplayString(tex->tex->type));
    out->AddProperty(&name, AI_MATKEY_TEXTURE_DIFFUSE(
                                    conv_data.next_texture[aiTextureType_DIFFUSE]++));
@ -1288,55 +1337,4 @@ aiNode *BlenderImporter::ConvertNode(const Scene &in, const Object *obj, Convers
    return node.release();
 }

-BlenderImporter::StreamOrError BlenderImporter::ParseMagicToken(const std::string &pFile, IOSystem *pIOHandler) const {
-    std::shared_ptr<IOStream> stream(pIOHandler->Open(pFile, "rb"));
-    if (stream == nullptr) {
-        return {{}, {}, "Could not open file for reading"};
-    }
-
-    char magic[8] = { 0 };
-    stream->Read(magic, 7, 1);
-    if (strcmp(magic, Token) == 0) {
-        return {stream, {}, {}};
-    }
-
-    // Check for presence of the gzip header. If yes, assume it is a
-    // compressed blend file and try uncompressing it, else fail. This is to
-    // avoid uncompressing random files which our loader might end up with.
-#ifdef ASSIMP_BUILD_NO_COMPRESSED_BLEND
-    return {{}, {}, "BLENDER magic bytes are missing, is this file compressed (Assimp was built without decompression support)?"};
-#else
-    if (magic[0] != 0x1f || static_cast<uint8_t>(magic[1]) != 0x8b) {
-        return {{}, {}, "BLENDER magic bytes are missing, couldn't find GZIP header either"};
-    }
-
-    LogDebug("Found no BLENDER magic word but a GZIP header, might be a compressed file");
-    if (magic[2] != 8) {
-        return {{}, {}, "Unsupported GZIP compression method"};
-    }
-
-    // http://www.gzip.org/zlib/rfc-gzip.html#header-trailer
-    stream->Seek(0L, aiOrigin_SET);
-    std::shared_ptr<StreamReaderLE> reader = std::shared_ptr<StreamReaderLE>(new StreamReaderLE(stream));
-
-    size_t total = 0;
-    Compression compression;
-    auto uncompressed = std::make_shared<std::vector<char>>();
-    if (compression.open(Compression::Format::Binary, Compression::FlushMode::NoFlush, 16 + Compression::MaxWBits)) {
-        total = compression.decompress((unsigned char *)reader->GetPtr(), reader->GetRemainingSize(), *uncompressed);
-        compression.close();
-    }
-
-    // replace the input stream with a memory stream
-    stream = std::make_shared<MemoryIOStream>(reinterpret_cast<uint8_t *>(uncompressed->data()), total);
-
-    // .. and retry
-    stream->Read(magic, 7, 1);
-    if (strcmp(magic, Token) == 0) {
-        return {stream, uncompressed, {}};
-    }
-    return {{}, {}, "Found no BLENDER magic word in decompressed GZIP file"};
-#endif
-}
-
 #endif // ASSIMP_BUILD_NO_BLEND_IMPORTER
--- a/code/AssetLib/Blender/BlenderLoader.h
+++ b/code/AssetLib/Blender/BlenderLoader.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -180,19 +180,6 @@ private:
            const Blender::MTex *tex,
            Blender::ConversionData &conv_data);

-    // TODO: Move to a std::variant, once c++17 is supported.
-    struct StreamOrError {
-        std::shared_ptr<IOStream> stream;
-        std::shared_ptr<std::vector<char>> input;
-        std::string error;
-    };
-
-    // Returns either a stream (and optional input data for the stream) or
-    // an error if it can't parse the magic token.
-    StreamOrError ParseMagicToken(
-            const std::string &pFile,
-            IOSystem *pIOHandler) const;
-
 private: // static stuff, mostly logging and error reporting.
    // --------------------
    static void CheckActualType(const Blender::ElemBase *dt,
--- a/code/AssetLib/Blender/BlenderModifier.cpp
+++ b/code/AssetLib/Blender/BlenderModifier.cpp
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team


 All rights reserved.
@ -71,6 +71,10 @@ static const fpCreateModifier creators[] = {
    nullptr // sentinel
 };

+// ------------------------------------------------------------------------------------------------
+struct SharedModifierData : ElemBase {
+    ModifierData modifier;
+};

 // ------------------------------------------------------------------------------------------------
 void BlenderModifierShowcase::ApplyModifiers(aiNode &out, ConversionData &conv_data, const Scene &in, const Object &orig_object) {
@ -153,7 +157,6 @@ void BlenderModifier_Mirror ::DoIt(aiNode &out, ConversionData &conv_data, const
    // hijacking the ABI, see the big note in BlenderModifierShowcase::ApplyModifiers()
    const MirrorModifierData &mir = static_cast<const MirrorModifierData &>(orig_modifier);
    ai_assert(mir.modifier.type == ModifierData::eModifierType_Mirror);
-    std::shared_ptr<Object> mirror_ob = mir.mirror_ob.lock();

    conv_data.meshes->reserve(conv_data.meshes->size() + out.mNumMeshes);

@ -168,8 +171,8 @@ void BlenderModifier_Mirror ::DoIt(aiNode &out, ConversionData &conv_data, const
        const float ys = mir.flag & MirrorModifierData::Flags_AXIS_Y ? -1.f : 1.f;
        const float zs = mir.flag & MirrorModifierData::Flags_AXIS_Z ? -1.f : 1.f;

-        if (mirror_ob) {
-            const aiVector3D center(mirror_ob->obmat[3][0], mirror_ob->obmat[3][1], mirror_ob->obmat[3][2]);
+        if (mir.mirror_ob) {
+            const aiVector3D center(mir.mirror_ob->obmat[3][0], mir.mirror_ob->obmat[3][1], mir.mirror_ob->obmat[3][2]);
            for (unsigned int j = 0; j < mesh->mNumVertices; ++j) {
                aiVector3D &v = mesh->mVertices[j];

@ -283,11 +286,6 @@ void BlenderModifier_Subdivision ::DoIt(aiNode &out, ConversionData &conv_data,
    if (conv_data.meshes->empty()) {
        return;
    }
-    const size_t meshIndex = conv_data.meshes->size() - out.mNumMeshes;
-    if (meshIndex >= conv_data.meshes->size()) {
-        ASSIMP_LOG_ERROR("Invalid index detected.");
-        return;
-    }
    aiMesh **const meshes = &conv_data.meshes[conv_data.meshes->size() - out.mNumMeshes];
    std::unique_ptr<aiMesh *[]> tempmeshes(new aiMesh *[out.mNumMeshes]());

--- a/code/AssetLib/Blender/BlenderModifier.h
+++ b/code/AssetLib/Blender/BlenderModifier.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team


 All rights reserved.
@ -62,7 +62,9 @@ public:
    /**
     *  The class destructor, virtual.
     */
-    virtual ~BlenderModifier() = default;
+    virtual ~BlenderModifier() {
+        // empty
+    }

    // --------------------
    /**
--- a/code/AssetLib/Blender/BlenderScene.cpp
+++ b/code/AssetLib/Blender/BlenderScene.cpp
@ -102,6 +102,10 @@ void Structure::Convert<CollectionObject>(

    ReadFieldPtr<ErrorPolicy_Fail>(dest.next, "*next", db);
    {
+        //std::shared_ptr<CollectionObject> prev;
+        //ReadFieldPtr<ErrorPolicy_Fail>(prev, "*prev", db);
+        //dest.prev = prev.get();
+
        std::shared_ptr<Object> ob;
        ReadFieldPtr<ErrorPolicy_Igno>(ob, "*ob", db);
        dest.ob = ob.get();
@ -297,7 +301,7 @@ void Structure ::Convert<Base>(
        const FileDatabase &db) const {
    // note: as per https://github.com/assimp/assimp/issues/128,
    // reading the Object linked list recursively is prone to stack overflow.
-    // This structure converter is therefore a hand-written exception that
+    // This structure converter is therefore an hand-written exception that
    // does it iteratively.

    const int initial_pos = db.reader->GetCurrentPos();
@ -565,7 +569,7 @@ void Structure ::Convert<MVert>(
        const FileDatabase &db) const {

    ReadFieldArray<ErrorPolicy_Fail>(dest.co, "co", db);
-    ReadFieldArray<ErrorPolicy_Warn>(dest.no, "no", db);
+    ReadFieldArray<ErrorPolicy_Fail>(dest.no, "no", db);
    ReadField<ErrorPolicy_Igno>(dest.flag, "flag", db);
    //ReadField<ErrorPolicy_Warn>(dest.mat_nr,"mat_nr",db);
    ReadField<ErrorPolicy_Igno>(dest.bweight, "bweight", db);
@ -620,9 +624,7 @@ void Structure ::Convert<ListBase>(
        const FileDatabase &db) const {

    ReadFieldPtr<ErrorPolicy_Igno>(dest.first, "*first", db);
-    std::shared_ptr<ElemBase> last;
-    ReadFieldPtr<ErrorPolicy_Igno>(last, "*last", db);
-    dest.last = last;
+    ReadFieldPtr<ErrorPolicy_Igno>(dest.last, "*last", db);

    db.reader->IncPtr(size);
 }
@ -646,9 +648,7 @@ void Structure ::Convert<ModifierData>(
        const FileDatabase &db) const {

    ReadFieldPtr<ErrorPolicy_Warn>(dest.next, "*next", db);
-    std::shared_ptr<ElemBase> prev;
-    ReadFieldPtr<ErrorPolicy_Warn>(prev, "*prev", db);
-    dest.prev = prev;
+    ReadFieldPtr<ErrorPolicy_Warn>(dest.prev, "*prev", db);
    ReadField<ErrorPolicy_Igno>(dest.type, "type", db);
    ReadField<ErrorPolicy_Igno>(dest.mode, "mode", db);
    ReadFieldArray<ErrorPolicy_Igno>(dest.name, "name", db);
@ -772,9 +772,7 @@ void Structure ::Convert<MirrorModifierData>(
    ReadField<ErrorPolicy_Igno>(dest.axis, "axis", db);
    ReadField<ErrorPolicy_Igno>(dest.flag, "flag", db);
    ReadField<ErrorPolicy_Igno>(dest.tolerance, "tolerance", db);
-    std::shared_ptr<Object> mirror_ob;
-    ReadFieldPtr<ErrorPolicy_Igno>(mirror_ob, "*mirror_ob", db);
-    dest.mirror_ob = mirror_ob;
+    ReadFieldPtr<ErrorPolicy_Igno>(dest.mirror_ob, "*mirror_ob", db);

    db.reader->IncPtr(size);
 }
@ -835,9 +833,9 @@ void Structure::Convert<CustomDataLayer>(
    ReadField<ErrorPolicy_Fail>(dest.flag, "flag", db);
    ReadField<ErrorPolicy_Fail>(dest.active, "active", db);
    ReadField<ErrorPolicy_Fail>(dest.active_rnd, "active_rnd", db);
-    ReadField<ErrorPolicy_Warn>(dest.active_clone, "active_clone", db);
-    ReadField<ErrorPolicy_Warn>(dest.active_mask, "active_mask", db);
-    ReadField<ErrorPolicy_Warn>(dest.uid, "uid", db);
+    ReadField<ErrorPolicy_Fail>(dest.active_clone, "active_clone", db);
+    ReadField<ErrorPolicy_Fail>(dest.active_mask, "active_mask", db);
+    ReadField<ErrorPolicy_Fail>(dest.uid, "uid", db);
    ReadFieldArray<ErrorPolicy_Warn>(dest.name, "name", db);
    ReadCustomDataPtr<ErrorPolicy_Fail>(dest.data, dest.type, "*data", db);

--- a/code/AssetLib/Blender/BlenderScene.h
+++ b/code/AssetLib/Blender/BlenderScene.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team


 All rights reserved.
@ -124,7 +124,7 @@ struct ID : ElemBase {
 // -------------------------------------------------------------------------------
 struct ListBase : ElemBase {
    std::shared_ptr<ElemBase> first;
-    std::weak_ptr<ElemBase> last;
+    std::shared_ptr<ElemBase> last;
 };

 // -------------------------------------------------------------------------------
@ -182,7 +182,7 @@ struct MVert : ElemBase {
    int bweight;

    MVert() :
-            flag(0), mat_nr(0), bweight(0) {}
+            ElemBase(), flag(0), mat_nr(0), bweight(0) {}
 };

 // -------------------------------------------------------------------------------
@ -417,6 +417,7 @@ struct CustomDataLayer : ElemBase {
    std::shared_ptr<ElemBase> data; // must be converted to real type according type member

    CustomDataLayer() :
+            ElemBase(),
            type(0),
            offset(0),
            flag(0),
@ -641,21 +642,14 @@ struct ModifierData : ElemBase {
    };

    std::shared_ptr<ElemBase> next WARN;
-    std::weak_ptr<ElemBase> prev WARN;
+    std::shared_ptr<ElemBase> prev WARN;

    int type, mode;
    char name[32];
 };

-
-// ------------------------------------------------------------------------------------------------
-struct SharedModifierData : ElemBase {
-    ModifierData modifier;
-};
-
-
 // -------------------------------------------------------------------------------
-struct SubsurfModifierData : SharedModifierData {
+struct SubsurfModifierData : ElemBase {

    enum Type {

@ -668,6 +662,7 @@ struct SubsurfModifierData : SharedModifierData {
        FLAGS_SubsurfUV = 1 << 3
    };

+    ModifierData modifier FAIL;
    short subdivType WARN;
    short levels FAIL;
    short renderLevels;
@ -675,7 +670,7 @@ struct SubsurfModifierData : SharedModifierData {
 };

 // -------------------------------------------------------------------------------
-struct MirrorModifierData : SharedModifierData {
+struct MirrorModifierData : ElemBase {

    enum Flags {
        Flags_CLIPPING = 1 << 0,
@ -687,9 +682,11 @@ struct MirrorModifierData : SharedModifierData {
        Flags_VGROUP = 1 << 6
    };

+    ModifierData modifier FAIL;
+
    short axis, flag;
    float tolerance;
-    std::weak_ptr<Object> mirror_ob;
+    std::shared_ptr<Object> mirror_ob;
 };

 // -------------------------------------------------------------------------------
@ -728,7 +725,7 @@ struct Object : ElemBase {
    ListBase modifiers;

    Object() :
-            type(Type_EMPTY), parent(nullptr) {
+            ElemBase(), type(Type_EMPTY), parent(nullptr), track(), proxy(), proxy_from(), data() {
        // empty
    }
 };
@ -740,7 +737,8 @@ struct Base : ElemBase {
    std::shared_ptr<Object> object WARN;

    Base() :
-            prev(nullptr) {
+            ElemBase(), prev(nullptr), next(), object() {
+        // empty
        // empty
    }
 };
@ -756,7 +754,10 @@ struct Scene : ElemBase {

    ListBase base;

-    Scene() = default;
+    Scene() :
+            ElemBase(), camera(), world(), basact(), master_collection() {
+        // empty
+    }
 };

 // -------------------------------------------------------------------------------
@ -786,7 +787,10 @@ struct Image : ElemBase {

    short gen_x, gen_y, gen_type;

-    Image() = default;
+    Image() :
+            ElemBase() {
+        // empty
+    }
 };

 // -------------------------------------------------------------------------------
@ -876,7 +880,7 @@ struct Tex : ElemBase {
    //char use_nodes;

    Tex() :
-            imaflag(ImageFlags_INTERPOL), type(Type_CLOUDS) {
+            ElemBase(), imaflag(ImageFlags_INTERPOL), type(Type_CLOUDS), ima() {
        // empty
    }
 };
@ -968,7 +972,10 @@ struct MTex : ElemBase {
    //float shadowfac;
    //float zenupfac, zendownfac, blendfac;

-    MTex() = default;
+    MTex() :
+            ElemBase() {
+        // empty
+    }
 };

 } // namespace Blender
--- a/code/AssetLib/Blender/BlenderTessellator.cpp
+++ b/code/AssetLib/Blender/BlenderTessellator.cpp
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team
+

 All rights reserved.

@ -39,8 +40,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 */

-/// @file  BlenderTessellator.cpp
-/// @brief A simple tessellation wrapper
+/** @file  BlenderTessellator.cpp
+ *  @brief A simple tessellation wrapper
+ */
+

 #ifndef ASSIMP_BUILD_NO_BLEND_IMPORTER

@ -59,7 +62,8 @@ namspace Assimp
 {
    template< > const char* LogFunctions< BlenderTessellatorGL >::Prefix()
    {
-        return "BLEND_TESS_GL: ";
+        static auto prefix = "BLEND_TESS_GL: ";
+        return prefix;
    }
 }

@ -77,7 +81,9 @@ BlenderTessellatorGL::BlenderTessellatorGL( BlenderBMeshConverter& converter ):
 }

 // ------------------------------------------------------------------------------------------------
-BlenderTessellatorGL::~BlenderTessellatorGL() = default;
+BlenderTessellatorGL::~BlenderTessellatorGL( )
+{
+}

 // ------------------------------------------------------------------------------------------------
 void BlenderTessellatorGL::Tessellate( const MLoop* polyLoop, int vertexCount, const std::vector< MVert >& vertices )
@ -253,7 +259,8 @@ namespace Assimp
 {
    template< > const char* LogFunctions< BlenderTessellatorP2T >::Prefix()
    {
-        return "BLEND_TESS_P2T: ";
+        static auto prefix = "BLEND_TESS_P2T: ";
+        return prefix;
    }
 }

@ -267,7 +274,9 @@ BlenderTessellatorP2T::BlenderTessellatorP2T( BlenderBMeshConverter& converter )
 }

 // ------------------------------------------------------------------------------------------------
-
+BlenderTessellatorP2T::~BlenderTessellatorP2T( )
+{
+}

 // ------------------------------------------------------------------------------------------------
 void BlenderTessellatorP2T::Tessellate( const MLoop* polyLoop, int vertexCount, const std::vector< MVert >& vertices )
--- a/code/AssetLib/Blender/BlenderTessellator.h
+++ b/code/AssetLib/Blender/BlenderTessellator.h
@ -2,7 +2,8 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team
+

 All rights reserved.

@ -143,7 +144,11 @@ namespace Assimp

 #if ASSIMP_BLEND_WITH_POLY_2_TRI

-#include "contrib/poly2tri/poly2tri/poly2tri.h"
+#ifdef ASSIMP_USE_HUNTER
+#  include <poly2tri/poly2tri.h>
+#else
+#  include "../contrib/poly2tri/poly2tri/poly2tri.h"
+#endif

 namespace Assimp
 {
@ -181,7 +186,7 @@ namespace Assimp
    {
    public:
        BlenderTessellatorP2T( BlenderBMeshConverter& converter );
-        ~BlenderTessellatorP2T( ) = default;
+        ~BlenderTessellatorP2T( );

        void Tessellate( const Blender::MLoop* polyLoop, int vertexCount, const std::vector< Blender::MVert >& vertices );

--- a/code/AssetLib/C4D/C4DImporter.cpp
+++ b/code/AssetLib/C4D/C4DImporter.cpp
@ -46,6 +46,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // no #ifdefing here, Cinema4D support is carried out in a branch of assimp
 // where it is turned on in the CMake settings.

+#ifndef _MSC_VER
+#   error C4D support is currently MSVC only
+#endif
+
 #include "C4DImporter.h"
 #include <memory>
 #include <assimp/IOSystem.hpp>
@ -82,7 +86,8 @@ void GetWriterInfo(int &id, String &appname) {

 namespace Assimp {
    template<> const char* LogFunctions<C4DImporter>::Prefix() {
-        return "C4D: ";
+        static auto prefix = "C4D: ";
+        return prefix;
    }
 }

@ -101,20 +106,25 @@ static const aiImporterDesc desc = {


 // ------------------------------------------------------------------------------------------------
-C4DImporter::C4DImporter() = default;
+C4DImporter::C4DImporter()
+: BaseImporter() {
+    // empty
+}

 // ------------------------------------------------------------------------------------------------
-C4DImporter::~C4DImporter() = default;
+C4DImporter::~C4DImporter() {
+    // empty
+}

 // ------------------------------------------------------------------------------------------------
-bool C4DImporter::CanRead( const std::string& pFile, IOSystem* pIOHandler, bool checkSig) const {
+bool C4DImporter::CanRead( const std::string& pFile, IOSystem* /*pIOHandler*/, bool /*checkSig*/) const {
    const std::string& extension = GetExtension(pFile);
    if (extension == "c4d") {
        return true;
    } else if ((!extension.length() || checkSig) && pIOHandler)   {
        // TODO
    }
-
+    
    return false;
 }

@ -301,7 +311,7 @@ void C4DImporter::RecurseHierarchy(BaseObject* object, aiNode* parent) {

    // based on Cineware sample code
    while (object) {
-        const Int32 type = object->GetType();
+        const LONG type = object->GetType();
        const Matrix& ml = object->GetMl();

        aiNode* const nd = new aiNode();
@ -364,8 +374,8 @@ aiMesh* C4DImporter::ReadMesh(BaseObject* object) {
    PolygonObject* const polyObject = dynamic_cast<PolygonObject*>(object);
    ai_assert(polyObject != nullptr);

-    const Int32 pointCount = polyObject->GetPointCount();
-    const Int32 polyCount = polyObject->GetPolygonCount();
+    const LONG pointCount = polyObject->GetPointCount();
+    const LONG polyCount = polyObject->GetPolygonCount();
    if(!polyObject || !pointCount) {
        LogWarn("ignoring mesh with zero vertices or faces");
        return nullptr;
@ -387,7 +397,7 @@ aiMesh* C4DImporter::ReadMesh(BaseObject* object) {
    unsigned int vcount = 0;

    // first count vertices
-    for (Int32 i = 0; i < polyCount; i++)
+    for (LONG i = 0; i < polyCount; i++)
    {
        vcount += 3;

@ -430,7 +440,7 @@ aiMesh* C4DImporter::ReadMesh(BaseObject* object) {
    }

    // copy vertices and extra channels over and populate faces
-    for (Int32 i = 0; i < polyCount; ++i, ++face) {
+    for (LONG i = 0; i < polyCount; ++i, ++face) {
        ai_assert(polys[i].a < pointCount && polys[i].a >= 0);
        const Vector& pointA = points[polys[i].a];
        verts->x = pointA.x;
@ -507,7 +517,7 @@ aiMesh* C4DImporter::ReadMesh(BaseObject* object) {
        if (tangents_src) {

            for(unsigned int k = 0; k < face->mNumIndices; ++k) {
-                Int32 l;
+                LONG l;
                switch(k) {
                case 0:
                    l = polys[i].a;
--- a/code/AssetLib/C4D/C4DImporter.h
+++ b/code/AssetLib/C4D/C4DImporter.h
@ -78,8 +78,6 @@ namespace Assimp  {
 // -------------------------------------------------------------------------------------------
 class C4DImporter : public BaseImporter, public LogFunctions<C4DImporter> {
 public:
-    C4DImporter();
-    ~C4DImporter() override;
    bool CanRead( const std::string& pFile, IOSystem*, bool checkSig) const override;

 protected:
--- a/code/AssetLib/COB/COBLoader.cpp
+++ b/code/AssetLib/COB/COBLoader.cpp
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -61,11 +61,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #include <memory>

-namespace Assimp {
+using namespace Assimp;
 using namespace Assimp::COB;
 using namespace Assimp::Formatter;

-static constexpr float units[] = {
+static const float units[] = {
    1000.f,
    100.f,
    1.f,
@ -76,7 +76,7 @@ static constexpr float units[] = {
    1.f / 1609.344f
 };

-static constexpr aiImporterDesc desc = {
+static const aiImporterDesc desc = {
    "TrueSpace Object Importer",
    "",
    "",
@ -89,6 +89,18 @@ static constexpr aiImporterDesc desc = {
    "cob scn"
 };

+// ------------------------------------------------------------------------------------------------
+// Constructor to be privately used by Importer
+COBImporter::COBImporter() {
+    // empty
+}
+
+// ------------------------------------------------------------------------------------------------
+// Destructor, private as well
+COBImporter::~COBImporter() {
+    // empty
+}
+
 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
 bool COBImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /*checkSig*/) const {
@ -150,7 +162,7 @@ void COBImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
    // sort faces by material indices
    for (std::shared_ptr<Node> &n : scene.nodes) {
        if (n->type == Node::TYPE_MESH) {
-            Mesh &mesh = (Mesh &)(*n);
+            Mesh &mesh = (Mesh &)(*n.get());
            for (Face &f : mesh.faces) {
                mesh.temp_map[f.material].push_back(&f);
            }
@ -160,7 +172,7 @@ void COBImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
    // count meshes
    for (std::shared_ptr<Node> &n : scene.nodes) {
        if (n->type == Node::TYPE_MESH) {
-            Mesh &mesh = (Mesh &)(*n);
+            Mesh &mesh = (Mesh &)(*n.get());
            if (mesh.vertex_positions.size() && mesh.texture_coords.size()) {
                pScene->mNumMeshes += static_cast<unsigned int>(mesh.temp_map.size());
            }
@ -203,7 +215,7 @@ void COBImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy
        }
    }

-    pScene->mRootNode = BuildNodes(*root, scene, pScene);
+    pScene->mRootNode = BuildNodes(*root.get(), scene, pScene);
    //flip normals after import
    FlipWindingOrderProcess flip;
    flip.Execute(pScene);
@ -372,11 +384,9 @@ aiNode *COBImporter::BuildNodes(const Node &root, const Scene &scin, aiScene *fi
    }

    // add children recursively
-    if (!root.temp_children.empty()) {
-        nd->mChildren = new aiNode *[root.temp_children.size()]();
-        for (const Node *n : root.temp_children) {
-            (nd->mChildren[nd->mNumChildren++] = BuildNodes(*n, scin, fill))->mParent = nd;
-        }
+    nd->mChildren = new aiNode *[root.temp_children.size()]();
+    for (const Node *n : root.temp_children) {
+        (nd->mChildren[nd->mNumChildren++] = BuildNodes(*n, scin, fill))->mParent = nd;
    }

    return nd;
@ -475,9 +485,8 @@ void COBImporter::ReadBasicNodeInfo_Ascii(Node &msh, LineSplitter &splitter, con
        } else if (splitter.match_start("Transform")) {
            for (unsigned int y = 0; y < 4 && ++splitter; ++y) {
                const char *s = splitter->c_str();
-                const char *end = s + splitter->size();
                for (unsigned int x = 0; x < 4; ++x) {
-                    SkipSpaces(&s, end);
+                    SkipSpaces(&s);
                    msh.transform[y][x] = fast_atof(&s);
                }
            }
@ -489,12 +498,12 @@ void COBImporter::ReadBasicNodeInfo_Ascii(Node &msh, LineSplitter &splitter, con

 // ------------------------------------------------------------------------------------------------
 template <typename T>
-void COBImporter::ReadFloat3Tuple_Ascii(T &fill, const char **in, const char *end) {
+void COBImporter::ReadFloat3Tuple_Ascii(T &fill, const char **in) {
    const char *rgb = *in;
    for (unsigned int i = 0; i < 3; ++i) {
-        SkipSpaces(&rgb, end);
+        SkipSpaces(&rgb);
        if (*rgb == ',') ++rgb;
-        SkipSpaces(&rgb, end);
+        SkipSpaces(&rgb);

        fill[i] = fast_atof(&rgb);
    }
@ -513,7 +522,7 @@ void COBImporter::ReadMat1_Ascii(Scene &out, LineSplitter &splitter, const Chunk
        return;
    }

-    out.materials.emplace_back();
+    out.materials.push_back(Material());
    Material &mat = out.materials.back();
    mat = nfo;

@ -541,7 +550,7 @@ void COBImporter::ReadMat1_Ascii(Scene &out, LineSplitter &splitter, const Chunk
    }

    const char *rgb = splitter[1];
-    ReadFloat3Tuple_Ascii(mat.rgb, &rgb, splitter.getEnd());
+    ReadFloat3Tuple_Ascii(mat.rgb, &rgb);

    ++splitter;
    if (!splitter.match_start("alpha ")) {
@ -620,21 +629,20 @@ void COBImporter::ReadLght_Ascii(Scene &out, LineSplitter &splitter, const Chunk
    }

    const char *rgb = splitter[1];
-    const char *end = splitter.getEnd();
-    ReadFloat3Tuple_Ascii(msh.color, &rgb, end);
+    ReadFloat3Tuple_Ascii(msh.color, &rgb);

-    SkipSpaces(&rgb, end);
+    SkipSpaces(&rgb);
    if (strncmp(rgb, "cone angle", 10) != 0) {
        ASSIMP_LOG_WARN("Expected `cone angle` entity in `color` line in `Lght` chunk ", nfo.id);
    }
-    SkipSpaces(rgb + 10, &rgb, end);
+    SkipSpaces(rgb + 10, &rgb);
    msh.angle = fast_atof(&rgb);

-    SkipSpaces(&rgb, end);
+    SkipSpaces(&rgb);
    if (strncmp(rgb, "inner angle", 11) != 0) {
        ASSIMP_LOG_WARN("Expected `inner angle` entity in `color` line in `Lght` chunk ", nfo.id);
    }
-    SkipSpaces(rgb + 11, &rgb, end);
+    SkipSpaces(rgb + 11, &rgb);
    msh.inner_angle = fast_atof(&rgb);

    // skip the rest for we can't handle this kind of physically-based lighting information.
@ -707,14 +715,14 @@ void COBImporter::ReadPolH_Ascii(Scene &out, LineSplitter &splitter, const Chunk

            for (unsigned int cur = 0; cur < cnt && ++splitter; ++cur) {
                const char *s = splitter->c_str();
-                const char *end = splitter.getEnd();
+
                aiVector3D &v = msh.vertex_positions[cur];

-                SkipSpaces(&s, end);
+                SkipSpaces(&s);
                v.x = fast_atof(&s);
-                SkipSpaces(&s, end);
+                SkipSpaces(&s);
                v.y = fast_atof(&s);
-                SkipSpaces(&s, end);
+                SkipSpaces(&s);
                v.z = fast_atof(&s);
            }
        } else if (splitter.match_start("Texture Vertices")) {
@ -723,13 +731,12 @@ void COBImporter::ReadPolH_Ascii(Scene &out, LineSplitter &splitter, const Chunk

            for (unsigned int cur = 0; cur < cnt && ++splitter; ++cur) {
                const char *s = splitter->c_str();
-                const char *end = splitter.getEnd();

                aiVector2D &v = msh.texture_coords[cur];

-                SkipSpaces(&s, end);
+                SkipSpaces(&s);
                v.x = fast_atof(&s);
-                SkipSpaces(&s, end);
+                SkipSpaces(&s);
                v.y = fast_atof(&s);
            }
        } else if (splitter.match_start("Faces")) {
@ -746,7 +753,7 @@ void COBImporter::ReadPolH_Ascii(Scene &out, LineSplitter &splitter, const Chunk
                    ThrowException("Expected Face line");
                }

-                msh.faces.emplace_back();
+                msh.faces.push_back(Face());
                Face &face = msh.faces.back();

                face.indices.resize(strtoul10(splitter[2]));
@ -754,9 +761,8 @@ void COBImporter::ReadPolH_Ascii(Scene &out, LineSplitter &splitter, const Chunk
                face.material = strtoul10(splitter[6]);

                const char *s = (++splitter)->c_str();
-                const char *end = splitter.getEnd();
                for (size_t i = 0; i < face.indices.size(); ++i) {
-                    if (!SkipSpaces(&s, end)) {
+                    if (!SkipSpaces(&s)) {
                        ThrowException("Expected EOL token in Face entry");
                    }
                    if ('<' != *s++) {
@ -866,7 +872,7 @@ void COBImporter::ReadBinaryFile(Scene &out, StreamReaderLE *reader) {
        return;
    }

-    while (true) {
+    while (1) {
        std::string type;
        type += reader->GetI1();
        type += reader->GetI1();
@ -950,7 +956,7 @@ void COBImporter::ReadPolH_Binary(COB::Scene &out, StreamReaderLE &reader, const
                ThrowException(format("A hole is the first entity in the `PolH` chunk with id ") << nfo.id);
            }
        } else
-            msh.faces.emplace_back();
+            msh.faces.push_back(Face());
        Face &f = msh.faces.back();

        const size_t num = reader.GetI2();
@ -962,7 +968,7 @@ void COBImporter::ReadPolH_Binary(COB::Scene &out, StreamReaderLE &reader, const
        }

        for (size_t x = 0; x < num; ++x) {
-            f.indices.emplace_back();
+            f.indices.push_back(VertexIndex());

            VertexIndex &v = f.indices.back();
            v.pos_idx = reader.GetI4();
@ -1002,7 +1008,7 @@ void COBImporter::ReadMat1_Binary(COB::Scene &out, StreamReaderLE &reader, const

    const chunk_guard cn(nfo, reader);

-    out.materials.emplace_back();
+    out.materials.push_back(Material());
    Material &mat = out.materials.back();
    mat = nfo;

@ -1052,7 +1058,7 @@ void COBImporter::ReadMat1_Binary(COB::Scene &out, StreamReaderLE &reader, const
    id[0] = reader.GetI1(), id[1] = reader.GetI1();

    if (id[0] == 'e' && id[1] == ':') {
-        mat.tex_env = std::make_shared<Texture>();
+        mat.tex_env.reset(new Texture());

        reader.GetI1();
        ReadString_Binary(mat.tex_env->path, reader);
@ -1062,7 +1068,7 @@ void COBImporter::ReadMat1_Binary(COB::Scene &out, StreamReaderLE &reader, const
    }

    if (id[0] == 't' && id[1] == ':') {
-        mat.tex_color = std::make_shared<Texture>();
+        mat.tex_color.reset(new Texture());

        reader.GetI1();
        ReadString_Binary(mat.tex_color->path, reader);
@ -1078,7 +1084,7 @@ void COBImporter::ReadMat1_Binary(COB::Scene &out, StreamReaderLE &reader, const
    }

    if (id[0] == 'b' && id[1] == ':') {
-        mat.tex_bump = std::make_shared<Texture>();
+        mat.tex_bump.reset(new Texture());

        reader.GetI1();
        ReadString_Binary(mat.tex_bump->path, reader);
@ -1170,6 +1176,4 @@ void COBImporter::ReadUnit_Binary(COB::Scene &out, StreamReaderLE &reader, const
    ASSIMP_LOG_WARN("`Unit` chunk ", nfo.id, " is a child of ", nfo.parent_id, " which does not exist");
 }

-}
-
 #endif // ASSIMP_BUILD_NO_COB_IMPORTER
--- a/code/AssetLib/COB/COBLoader.h
+++ b/code/AssetLib/COB/COBLoader.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team


 All rights reserved.
@ -56,16 +56,16 @@ class LineSplitter;

 // TinyFormatter.h
 namespace Formatter {
-    template <typename T, typename TR, typename A>
-    class basic_formatter;
-    typedef class basic_formatter<char, std::char_traits<char>, std::allocator<char>> format;
+template <typename T, typename TR, typename A>
+class basic_formatter;
+typedef class basic_formatter<char, std::char_traits<char>, std::allocator<char>> format;
 } // namespace Formatter

 // COBScene.h
 namespace COB {
-    struct ChunkInfo;
-    struct Node;
-    struct Scene;
+struct ChunkInfo;
+struct Node;
+struct Scene;
 } // namespace COB

 // -------------------------------------------------------------------------------------------
@ -75,8 +75,8 @@ namespace COB {
 // -------------------------------------------------------------------------------------------
 class COBImporter : public BaseImporter {
 public:
-    COBImporter() = default;
-    ~COBImporter() override = default;
+    COBImporter();
+    ~COBImporter() override;

    // --------------------
    bool CanRead(const std::string &pFile, IOSystem *pIOHandler,
@ -120,7 +120,7 @@ private:
    void ReadChunkInfo_Ascii(COB::ChunkInfo &out, const LineSplitter &splitter);
    void ReadBasicNodeInfo_Ascii(COB::Node &msh, LineSplitter &splitter, const COB::ChunkInfo &nfo);
    template <typename T>
-    void ReadFloat3Tuple_Ascii(T &fill, const char **in, const char *end);
+    void ReadFloat3Tuple_Ascii(T &fill, const char **in);

    void ReadPolH_Ascii(COB::Scene &out, LineSplitter &splitter, const COB::ChunkInfo &nfo);
    void ReadBitM_Ascii(COB::Scene &out, LineSplitter &splitter, const COB::ChunkInfo &nfo);
--- a/code/AssetLib/COB/COBScene.h
+++ b/code/AssetLib/COB/COBScene.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -107,7 +107,7 @@ struct Node : public ChunkInfo
        TYPE_MESH,TYPE_GROUP,TYPE_LIGHT,TYPE_CAMERA,TYPE_BONE
    };

-    virtual ~Node() = default;
+    virtual ~Node() {}
    Node(Type type) : type(type), unit_scale(1.f){}

    Type type;
--- a/code/AssetLib/CSM/CSMLoader.cpp
+++ b/code/AssetLib/CSM/CSMLoader.cpp
@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team



@ -44,6 +44,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file  CSMLoader.cpp
 *  Implementation of the CSM importer class.
 */
+
+
+
 #ifndef ASSIMP_BUILD_NO_CSM_IMPORTER

 #include "CSMLoader.h"
@ -60,7 +63,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 using namespace Assimp;

-static constexpr aiImporterDesc desc = {
+static const aiImporterDesc desc = {
    "CharacterStudio Motion Importer (MoCap)",
    "",
    "",
@ -76,26 +79,34 @@ static constexpr aiImporterDesc desc = {

 // ------------------------------------------------------------------------------------------------
 // Constructor to be privately used by Importer
-CSMImporter::CSMImporter() : noSkeletonMesh(){
-    // empty
-}
+CSMImporter::CSMImporter()
+: noSkeletonMesh()
+{}
+
+// ------------------------------------------------------------------------------------------------
+// Destructor, private as well
+CSMImporter::~CSMImporter()
+{}

 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
-bool CSMImporter::CanRead( const std::string& pFile, IOSystem* pIOHandler, bool /*checkSig*/) const {
+bool CSMImporter::CanRead( const std::string& pFile, IOSystem* pIOHandler, bool /*checkSig*/) const
+{
    static const char* tokens[] = {"$Filename"};
    return SearchFileHeaderForToken(pIOHandler,pFile,tokens,AI_COUNT_OF(tokens));
 }

 // ------------------------------------------------------------------------------------------------
 // Build a string of all file extensions supported
-const aiImporterDesc* CSMImporter::GetInfo () const {
+const aiImporterDesc* CSMImporter::GetInfo () const
+{
    return &desc;
 }

 // ------------------------------------------------------------------------------------------------
 // Setup configuration properties for the loader
-void CSMImporter::SetupProperties(const Importer* pImp) {
+void CSMImporter::SetupProperties(const Importer* pImp)
+{
    noSkeletonMesh = pImp->GetPropertyInteger(AI_CONFIG_IMPORT_NO_SKELETON_MESHES,0) != 0;
 }

@ -107,7 +118,7 @@ void CSMImporter::InternReadFile( const std::string& pFile,
    std::unique_ptr<IOStream> file( pIOHandler->Open( pFile, "rb"));

    // Check whether we can read from the file
-    if (file == nullptr) {
+    if( file.get() == nullptr) {
        throw DeadlyImportError( "Failed to open CSM file ", pFile, ".");
    }

@ -115,38 +126,38 @@ void CSMImporter::InternReadFile( const std::string& pFile,
    std::vector<char> mBuffer2;
    TextFileToBuffer(file.get(),mBuffer2);
    const char* buffer = &mBuffer2[0];
-    const char *end = &mBuffer2[mBuffer2.size() - 1] + 1;
+
    std::unique_ptr<aiAnimation> anim(new aiAnimation());
    int first = 0, last = 0x00ffffff;

    // now process the file and look out for '$' sections
-    while (true) {
-        SkipSpaces(&buffer, end);
+    while (1)   {
+        SkipSpaces(&buffer);
        if ('\0' == *buffer)
            break;

        if ('$'  == *buffer)    {
            ++buffer;
            if (TokenMatchI(buffer,"firstframe",10))    {
-                SkipSpaces(&buffer, end);
+                SkipSpaces(&buffer);
                first = strtol10(buffer,&buffer);
            }
            else if (TokenMatchI(buffer,"lastframe",9))     {
-                SkipSpaces(&buffer, end);
+                SkipSpaces(&buffer);
                last = strtol10(buffer,&buffer);
            }
            else if (TokenMatchI(buffer,"rate",4))  {
-                SkipSpaces(&buffer, end);
-                float d = { 0.0f };
+                SkipSpaces(&buffer);
+                float d;
                buffer = fast_atoreal_move<float>(buffer,d);
                anim->mTicksPerSecond = d;
            }
            else if (TokenMatchI(buffer,"order",5)) {
                std::vector< aiNodeAnim* > anims_temp;
                anims_temp.reserve(30);
-                while (true) {
-                    SkipSpaces(&buffer, end);
-                    if (IsLineEnd(*buffer) && SkipSpacesAndLineEnd(&buffer, end) && *buffer == '$')
+                while (1)   {
+                    SkipSpaces(&buffer);
+                    if (IsLineEnd(*buffer) && SkipSpacesAndLineEnd(&buffer) && *buffer == '$')
                        break; // next section

                    // Construct a new node animation channel and setup its name
@ -154,43 +165,41 @@ void CSMImporter::InternReadFile( const std::string& pFile,
                    aiNodeAnim* nda = anims_temp.back();

                    char* ot = nda->mNodeName.data;
-                    while (!IsSpaceOrNewLine(*buffer)) {
+                    while (!IsSpaceOrNewLine(*buffer))
                        *ot++ = *buffer++;
-                    }

                    *ot = '\0';
                    nda->mNodeName.length = static_cast<ai_uint32>(ot-nda->mNodeName.data);
                }

                anim->mNumChannels = static_cast<unsigned int>(anims_temp.size());
-                if (!anim->mNumChannels) {
+                if (!anim->mNumChannels)
                    throw DeadlyImportError("CSM: Empty $order section");
-                }

                // copy over to the output animation
                anim->mChannels = new aiNodeAnim*[anim->mNumChannels];
                ::memcpy(anim->mChannels,&anims_temp[0],sizeof(aiNodeAnim*)*anim->mNumChannels);
-            } else if (TokenMatchI(buffer,"points",6)) {
-                if (!anim->mNumChannels) {
+            }
+            else if (TokenMatchI(buffer,"points",6))    {
+                if (!anim->mNumChannels)
                    throw DeadlyImportError("CSM: \'$order\' section is required to appear prior to \'$points\'");
-                }

                // If we know how many frames we'll read, we can preallocate some storage
                unsigned int alloc = 100;
-                if (last != 0x00ffffff) {
+                if (last != 0x00ffffff)
+                {
                    alloc = last-first;
                    alloc += alloc>>2u; // + 25%
-                    for (unsigned int i = 0; i < anim->mNumChannels; ++i) {
+                    for (unsigned int i = 0; i < anim->mNumChannels;++i)
                        anim->mChannels[i]->mPositionKeys = new aiVectorKey[alloc];
-                    }
                }

                unsigned int filled = 0;

                // Now read all point data.
-                while (true) {
-                    SkipSpaces(&buffer, end);
-                    if (IsLineEnd(*buffer) && (!SkipSpacesAndLineEnd(&buffer, end) || *buffer == '$'))   {
+                while (1)   {
+                    SkipSpaces(&buffer);
+                    if (IsLineEnd(*buffer) && (!SkipSpacesAndLineEnd(&buffer) || *buffer == '$'))   {
                        break; // next section
                    }

@ -201,8 +210,8 @@ void CSMImporter::InternReadFile( const std::string& pFile,
                    for (unsigned int i = 0; i < anim->mNumChannels;++i)    {

                        aiNodeAnim* s = anim->mChannels[i];
-                        if (s->mNumPositionKeys == alloc)   {
-                            // need to reallocate?
+                        if (s->mNumPositionKeys == alloc)   { /* need to reallocate? */
+
                            aiVectorKey* old = s->mPositionKeys;
                            s->mPositionKeys = new aiVectorKey[s->mNumPositionKeys = alloc*2];
                            ::memcpy(s->mPositionKeys,old,sizeof(aiVectorKey)*alloc);
@ -210,26 +219,24 @@ void CSMImporter::InternReadFile( const std::string& pFile,
                        }

                        // read x,y,z
-                        if (!SkipSpacesAndLineEnd(&buffer, end)) {
+                        if(!SkipSpacesAndLineEnd(&buffer))
                            throw DeadlyImportError("CSM: Unexpected EOF occurred reading sample x coord");
-                        }

                        if (TokenMatchI(buffer, "DROPOUT", 7))  {
                            // seems this is invalid marker data; at least the doc says it's possible
                            ASSIMP_LOG_WARN("CSM: Encountered invalid marker data (DROPOUT)");
-                        } else {
+                        }
+                        else    {
                            aiVectorKey* sub = s->mPositionKeys + s->mNumPositionKeys;
                            sub->mTime = (double)frame;
                            buffer = fast_atoreal_move<float>(buffer, (float&)sub->mValue.x);

-                            if (!SkipSpacesAndLineEnd(&buffer, end)) {
+                            if(!SkipSpacesAndLineEnd(&buffer))
                                throw DeadlyImportError("CSM: Unexpected EOF occurred reading sample y coord");
-                            }
                            buffer = fast_atoreal_move<float>(buffer, (float&)sub->mValue.y);

-                            if (!SkipSpacesAndLineEnd(&buffer, end)) {
+                            if(!SkipSpacesAndLineEnd(&buffer))
                                throw DeadlyImportError("CSM: Unexpected EOF occurred reading sample z coord");
-                            }
                            buffer = fast_atoreal_move<float>(buffer, (float&)sub->mValue.z);

                            ++s->mNumPositionKeys;
@ -237,22 +244,22 @@ void CSMImporter::InternReadFile( const std::string& pFile,
                    }

                    // update allocation granularity
-                    if (filled == alloc) {
+                    if (filled == alloc)
                        alloc *= 2;
-                    }

                    ++filled;
                }
                // all channels must be complete in order to continue safely.
                for (unsigned int i = 0; i < anim->mNumChannels;++i)    {
-                    if (!anim->mChannels[i]->mNumPositionKeys) {
+
+                    if (!anim->mChannels[i]->mNumPositionKeys)
                        throw DeadlyImportError("CSM: Invalid marker track");
-                    }
                }
            }
-        } else {
+        }
+        else    {
            // advance to the next line
-            SkipLine(&buffer, end);
+            SkipLine(&buffer);
        }
    }

@ -266,7 +273,7 @@ void CSMImporter::InternReadFile( const std::string& pFile,
    pScene->mRootNode->mNumChildren = anim->mNumChannels;
    pScene->mRootNode->mChildren = new aiNode* [anim->mNumChannels];

-    for (unsigned int i = 0; i < anim->mNumChannels;++i) {
+    for (unsigned int i = 0; i < anim->mNumChannels;++i)    {
        aiNodeAnim* na = anim->mChannels[i];

        aiNode* nd  = pScene->mRootNode->mChildren[i] = new aiNode();
--- a/code/AssetLib/CSM/CSMLoader.h
+++ b/code/AssetLib/CSM/CSMLoader.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -61,7 +61,7 @@ namespace Assimp {
 class CSMImporter : public BaseImporter {
 public:
    CSMImporter();
-    ~CSMImporter() override = default;
+    ~CSMImporter() override;

    // -------------------------------------------------------------------
    bool CanRead(const std::string &pFile, IOSystem *pIOHandler,
@ -81,8 +81,9 @@ protected:
 private:
    bool noSkeletonMesh;

-};
+}; // end of class CSMImporter

-} // namespace Assimp
+} // end of namespace Assimp

 #endif // AI_AC3DIMPORTER_H_INC
+
--- a/code/AssetLib/Collada/ColladaExporter.cpp
+++ b/code/AssetLib/Collada/ColladaExporter.cpp
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team


 All rights reserved.
@ -91,7 +91,7 @@ void ExportSceneCollada(const char *pFile, IOSystem *pIOSystem, const aiScene *p
 // Encodes a string into a valid XML ID using the xsd:ID schema qualifications.
 static const std::string XMLIDEncode(const std::string &name) {
    const char XML_ID_CHARS[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_-.";
-    const unsigned int XML_ID_CHARS_COUNT = sizeof(XML_ID_CHARS) / sizeof(char) - 1;
+    const unsigned int XML_ID_CHARS_COUNT = sizeof(XML_ID_CHARS) / sizeof(char);

    if (name.length() == 0) {
        return name;
@ -154,7 +154,8 @@ ColladaExporter::ColladaExporter(const aiScene *pScene, IOSystem *pIOSystem, con

 // ------------------------------------------------------------------------------------------------
 // Destructor
-ColladaExporter::~ColladaExporter() = default;
+ColladaExporter::~ColladaExporter() {
+}

 // ------------------------------------------------------------------------------------------------
 // Starts writing the contents
@ -246,7 +247,7 @@ void ColladaExporter::WriteHeader() {
    }

    // Assimp root nodes can have meshes, Collada Scenes cannot
-    if (mScene->mRootNode->mNumChildren == 0 || mScene->mRootNode->mMeshes != nullptr) {
+    if (mScene->mRootNode->mNumChildren == 0 || mScene->mRootNode->mMeshes != 0) {
        mAdd_root_node = true;
    }

@ -448,7 +449,7 @@ void ColladaExporter::WriteLight(size_t pIndex) {
    PushTag();
    switch (light->mType) {
    case aiLightSource_AMBIENT:
-        WriteAmbientLight(light);
+        WriteAmbienttLight(light);
        break;
    case aiLightSource_DIRECTIONAL:
        WriteDirectionalLight(light);
@ -543,7 +544,7 @@ void ColladaExporter::WriteSpotLight(const aiLight *const light) {
    mOutput << startstr << "</spot>" << endstr;
 }

-void ColladaExporter::WriteAmbientLight(const aiLight *const light) {
+void ColladaExporter::WriteAmbienttLight(const aiLight *const light) {

    const aiColor3D &color = light->mColorAmbient;
    mOutput << startstr << "<ambient>" << endstr;
@ -1329,9 +1330,9 @@ void ColladaExporter::WriteAnimationLibrary(size_t pIndex) {
            std::vector<std::string> names;
            for (size_t i = 0; i < nodeAnim->mNumPositionKeys; ++i) {
                if (nodeAnim->mPreState == aiAnimBehaviour_DEFAULT || nodeAnim->mPreState == aiAnimBehaviour_LINEAR || nodeAnim->mPreState == aiAnimBehaviour_REPEAT) {
-                    names.emplace_back("LINEAR");
+                    names.push_back("LINEAR");
                } else if (nodeAnim->mPostState == aiAnimBehaviour_CONSTANT) {
-                    names.emplace_back("STEP");
+                    names.push_back("STEP");
                }
            }

--- a/code/AssetLib/Collada/ColladaExporter.h
+++ b/code/AssetLib/Collada/ColladaExporter.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team


 All rights reserved.
@ -101,7 +101,7 @@ protected:
    void WritePointLight(const aiLight *const light);
    void WriteDirectionalLight(const aiLight *const light);
    void WriteSpotLight(const aiLight *const light);
-    void WriteAmbientLight(const aiLight *const light);
+    void WriteAmbienttLight(const aiLight *const light);

    /// Writes the controller library
    void WriteControllerLibrary();
@ -233,7 +233,7 @@ public:
        Surface ambient, diffuse, specular, emissive, reflective, transparent, normal;
        Property shininess, transparency, index_refraction;

-        Material() = default;
+        Material() {}
    };

    std::map<unsigned int, std::string> textures;
--- a/code/AssetLib/Collada/ColladaHelper.cpp
+++ b/code/AssetLib/Collada/ColladaHelper.cpp
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

--- a/code/AssetLib/Collada/ColladaHelper.h
+++ b/code/AssetLib/Collada/ColladaHelper.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -666,7 +666,7 @@ struct ChannelEntry {
    const Collada::Accessor *mTimeAccessor; ///> Collada accessor to the time values
    const Collada::Data *mTimeData; ///> Source data array for the time values
    const Collada::Accessor *mValueAccessor; ///> Collada accessor to the key value values
-    const Collada::Data *mValueData; ///> Source data array for the key value values
+    const Collada::Data *mValueData; ///> Source datat array for the key value values

    ChannelEntry() :
            mChannel(),
--- a/code/AssetLib/Collada/ColladaLoader.cpp
+++ b/code/AssetLib/Collada/ColladaLoader.cpp
@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -64,7 +64,7 @@ namespace Assimp {
 using namespace Assimp::Formatter;
 using namespace Assimp::Collada;

-static constexpr aiImporterDesc desc = {
+static const aiImporterDesc desc = {
    "Collada Importer",
    "",
    "",
@ -92,15 +92,29 @@ inline void AddNodeMetaData(aiNode *node, const std::string &key, const T &value
 // ------------------------------------------------------------------------------------------------
 // Constructor to be privately used by Importer
 ColladaLoader::ColladaLoader() :
+        mFileName(),
+        mMeshIndexByID(),
+        mMaterialIndexByName(),
+        mMeshes(),
+        newMats(),
+        mCameras(),
+        mLights(),
+        mTextures(),
+        mAnims(),
        noSkeletonMesh(false),
        removeEmptyBones(false),
        ignoreUpDirection(false),
-        ignoreUnitSize(false),
        useColladaName(false),
        mNodeNameCounter(0) {
    // empty
 }

+// ------------------------------------------------------------------------------------------------
+// Destructor, private as well
+ColladaLoader::~ColladaLoader() {
+    // empty
+}
+
 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
 bool ColladaLoader::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /*checkSig*/) const {
@ -119,7 +133,6 @@ void ColladaLoader::SetupProperties(const Importer *pImp) {
    noSkeletonMesh = pImp->GetPropertyInteger(AI_CONFIG_IMPORT_NO_SKELETON_MESHES, 0) != 0;
    removeEmptyBones = pImp->GetPropertyInteger(AI_CONFIG_IMPORT_REMOVE_EMPTY_BONES, true) != 0;
    ignoreUpDirection = pImp->GetPropertyInteger(AI_CONFIG_IMPORT_COLLADA_IGNORE_UP_DIRECTION, 0) != 0;
-    ignoreUnitSize = pImp->GetPropertyInteger(AI_CONFIG_IMPORT_COLLADA_IGNORE_UNIT_SIZE, 0) != 0;
    useColladaName = pImp->GetPropertyInteger(AI_CONFIG_IMPORT_COLLADA_USE_COLLADA_NAMES, 0) != 0;
 }

@ -168,15 +181,12 @@ void ColladaLoader::InternReadFile(const std::string &pFile, aiScene *pScene, IO
    // ... then fill the materials with the now adjusted settings
    FillMaterials(parser, pScene);

-    if (!ignoreUnitSize) {
-        // Apply unit-size scale calculation
-        pScene->mRootNode->mTransformation *= aiMatrix4x4(
-                parser.mUnitSize, 0, 0, 0,
-                0, parser.mUnitSize, 0, 0,
-                0, 0, parser.mUnitSize, 0,
-                0, 0, 0, 1);
-    }
-    
+    // Apply unit-size scale calculation
+
+    pScene->mRootNode->mTransformation *= aiMatrix4x4(parser.mUnitSize, 0, 0, 0,
+            0, parser.mUnitSize, 0, 0,
+            0, 0, parser.mUnitSize, 0,
+            0, 0, 0, 1);
    if (!ignoreUpDirection) {
        // Convert to Y_UP, if different orientation
        if (parser.mUpDirection == ColladaParser::UP_X) {
@ -247,9 +257,7 @@ aiNode *ColladaLoader::BuildHierarchy(const ColladaParser &pParser, const Collad

    // add children. first the *real* ones
    node->mNumChildren = static_cast<unsigned int>(pNode->mChildren.size() + instances.size());
-    if (node->mNumChildren != 0) {
-        node->mChildren = new aiNode * [node->mNumChildren];
-    }
+    node->mChildren = new aiNode *[node->mNumChildren];

    for (size_t a = 0; a < pNode->mChildren.size(); ++a) {
        node->mChildren[a] = BuildHierarchy(pParser, pNode->mChildren[a]);
@ -625,14 +633,16 @@ aiMesh *ColladaLoader::CreateMesh(const ColladaParser &pParser, const Mesh *pSrc
    }

    // same for texture coords, as many as we have
-    for (size_t a = 0; a < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++a) {
+    // empty slots are not allowed, need to pack and adjust UV indexes accordingly
+    for (size_t a = 0, real = 0; a < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++a) {
        if (pSrcMesh->mTexCoords[a].size() >= pStartVertex + numVertices) {
-            dstMesh->mTextureCoords[a] = new aiVector3D[numVertices];
+            dstMesh->mTextureCoords[real] = new aiVector3D[numVertices];
            for (size_t b = 0; b < numVertices; ++b) {
-                dstMesh->mTextureCoords[a][b] = pSrcMesh->mTexCoords[a][pStartVertex + b];
+                dstMesh->mTextureCoords[real][b] = pSrcMesh->mTexCoords[a][pStartVertex + b];
            }

-            dstMesh->mNumUVComponents[a] = pSrcMesh->mNumUVComponents[a];
+            dstMesh->mNumUVComponents[real] = pSrcMesh->mNumUVComponents[a];
+            ++real;
        }
    }

@ -1256,12 +1266,12 @@ void ColladaLoader::CreateAnimation(aiScene *pScene, const ColladaParser &pParse
            // now for every unique point in time, find or interpolate the key values for that time
            // and apply them to the transform chain. Then the node's present transformation can be calculated.
            ai_real time = startTime;
-            while (true) {
+            while (1) {
                for (ChannelEntry & e : entries) {
                    // find the keyframe behind the current point in time
                    size_t pos = 0;
                    ai_real postTime = 0.0;
-                    while (true) {
+                    while (1) {
                        if (pos >= e.mTimeAccessor->mCount) {
                            break;
                        }
@ -1515,7 +1525,7 @@ void ColladaLoader::AddTexture(aiMaterial &mat,
        map = -1;
        for (std::string::const_iterator it = sampler.mUVChannel.begin(); it != sampler.mUVChannel.end(); ++it) {
            if (IsNumeric(*it)) {
-                map = strtoul10(&(*it));
+                map = strtoul10(&(*it));        
                break;
            }
        }
@ -1672,7 +1682,7 @@ aiString ColladaLoader::FindFilenameForEffectTexture(const ColladaParser &pParse

    // recurse through the param references until we end up at an image
    std::string name = pName;
-    while (true) {
+    while (1) {
        // the given string is a param entry. Find it
        Effect::ParamLibrary::const_iterator it = pEffect.mParams.find(name);
        // if not found, we're at the end of the recursion. The resulting string should be the image ID
--- a/code/AssetLib/Collada/ColladaLoader.h
+++ b/code/AssetLib/Collada/ColladaLoader.h
@ -4,7 +4,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team


 All rights reserved.
@ -86,7 +86,7 @@ public:
    ColladaLoader();

    /// The class destructor.
-    ~ColladaLoader() override = default;
+    ~ColladaLoader() override;

    /// Returns whether the class can handle the format of the given file.
    /// @see BaseImporter::CanRead() for more details.
@ -239,7 +239,6 @@ protected:
    bool noSkeletonMesh;
    bool removeEmptyBones;
    bool ignoreUpDirection;
-    bool ignoreUnitSize;
    bool useColladaName;

    /** Used by FindNameForNode() to generate unique node names */
--- a/code/AssetLib/Collada/ColladaParser.cpp
+++ b/code/AssetLib/Collada/ColladaParser.cpp
@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -55,7 +55,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/DefaultLogger.hpp>
 #include <assimp/IOSystem.hpp>
 #include <memory>
-#include <utility>

 using namespace Assimp;
 using namespace Assimp::Collada;
@ -68,7 +67,7 @@ static void ReportWarning(const char *msg, ...) {
    va_start(args, msg);

    char szBuffer[3000];
-    const int iLen = vsnprintf(szBuffer, sizeof(szBuffer), msg, args);
+    const int iLen = vsprintf(szBuffer, msg, args);
    ai_assert(iLen > 0);

    va_end(args);
@ -145,7 +144,7 @@ ColladaParser::ColladaParser(IOSystem *pIOHandler, const std::string &pFile) :
    } else {
        // attempt to open the file directly
        daefile.reset(pIOHandler->Open(pFile));
-        if (daefile == nullptr) {
+        if (daefile.get() == nullptr) {
            throw DeadlyImportError("Failed to open file '", pFile, "'.");
        }
    }
@ -635,8 +634,7 @@ void ColladaParser::ReadController(XmlNode &node, Collada::Controller &controlle
        const std::string &currentName = currentNode.name();
        if (currentName == "morph") {
            controller.mType = Morph;
-            std::string id = currentNode.attribute("source").as_string();
-            controller.mMeshId = id.substr(1, id.size() - 1);
+            controller.mMeshId = currentNode.attribute("source").as_string();
            int methodIndex = currentNode.attribute("method").as_int();
            if (methodIndex > 0) {
                std::string method;
@ -655,13 +653,12 @@ void ColladaParser::ReadController(XmlNode &node, Collada::Controller &controlle
            std::string v;
            XmlParser::getValueAsString(currentNode, v);
            const char *content = v.c_str();
-            const char *end = content + v.size();
            for (unsigned int a = 0; a < 16; a++) {
-                SkipSpacesAndLineEnd(&content, end);
+                SkipSpacesAndLineEnd(&content);
                // read a number
                content = fast_atoreal_move<ai_real>(content, controller.mBindShapeMatrix[a]);
                // skip whitespace after it
-                SkipSpacesAndLineEnd(&content, end);
+                SkipSpacesAndLineEnd(&content);
            }
        } else if (currentName == "source") {
            ReadSource(currentNode);
@ -742,9 +739,7 @@ void ColladaParser::ReadControllerWeights(XmlNode &node, Collada::Controller &pC
                throw DeadlyImportError("Unknown semantic \"", attrSemantic, "\" in <vertex_weights> data <input> element");
            }
        } else if (currentName == "vcount" && vertexCount > 0) {
-            const std::string stdText = currentNode.text().as_string();
-            const char *text = stdText.c_str();
-            const char *end = text + stdText.size();
+            const char *text = currentNode.text().as_string();
            size_t numWeights = 0;
            for (std::vector<size_t>::iterator it = pController.mWeightCounts.begin(); it != pController.mWeightCounts.end(); ++it) {
                if (*text == 0) {
@ -753,7 +748,7 @@ void ColladaParser::ReadControllerWeights(XmlNode &node, Collada::Controller &pC

                *it = strtoul10(text, &text);
                numWeights += *it;
-                SkipSpacesAndLineEnd(&text, end);
+                SkipSpacesAndLineEnd(&text);
            }
            // reserve weight count
            pController.mWeights.resize(numWeights);
@ -762,19 +757,17 @@ void ColladaParser::ReadControllerWeights(XmlNode &node, Collada::Controller &pC
            std::string stdText;
            XmlParser::getValueAsString(currentNode, stdText);
            const char *text = stdText.c_str();
-            const char *end = text + stdText.size();
            for (std::vector<std::pair<size_t, size_t>>::iterator it = pController.mWeights.begin(); it != pController.mWeights.end(); ++it) {
-                if (text == nullptr) {
+                if (text == 0) {
                    throw DeadlyImportError("Out of data while reading <vertex_weights>");
                }
-                SkipSpacesAndLineEnd(&text, end);
                it->first = strtoul10(text, &text);
-                SkipSpacesAndLineEnd(&text, end);
+                SkipSpacesAndLineEnd(&text);
                if (*text == 0) {
                    throw DeadlyImportError("Out of data while reading <vertex_weights>");
                }
                it->second = strtoul10(text, &text);
-                SkipSpacesAndLineEnd(&text, end);
+                SkipSpacesAndLineEnd(&text);
            }
        }
    }
@ -819,38 +812,38 @@ void ColladaParser::ReadImage(XmlNode &node, Collada::Image &pImage) {
                if (!pImage.mFileName.length()) {
                    pImage.mFileName = "unknown_texture";
                }
-            } else if (mFormat == FV_1_5_n) {
-                std::string value;
-                XmlNode refChild = currentNode.child("ref");
-                XmlNode hexChild = currentNode.child("hex");
-                if (refChild) {
-                    // element content is filename - hopefully
-                    if (XmlParser::getValueAsString(refChild, value)) {
-                        aiString filepath(value);
-                        UriDecodePath(filepath);
-                        pImage.mFileName = filepath.C_Str();
-                    }
-                } else if (hexChild && !pImage.mFileName.length()) {
-                    // embedded image. get format
-                    pImage.mEmbeddedFormat = hexChild.attribute("format").as_string();
-                    if (pImage.mEmbeddedFormat.empty()) {
-                        ASSIMP_LOG_WARN("Collada: Unknown image file format");
-                    }
+            }
+        } else if (mFormat == FV_1_5_n) {
+            std::string value;
+            XmlNode refChild = currentNode.child("ref");
+            XmlNode hexChild = currentNode.child("hex");
+            if (refChild) {
+                // element content is filename - hopefully
+                if (XmlParser::getValueAsString(refChild, value)) {
+                    aiString filepath(value);
+                    UriDecodePath(filepath);
+                    pImage.mFileName = filepath.C_Str();
+                }
+            } else if (hexChild && !pImage.mFileName.length()) {
+                // embedded image. get format
+                pImage.mEmbeddedFormat = hexChild.attribute("format").as_string();
+                if (pImage.mEmbeddedFormat.empty()) {
+                    ASSIMP_LOG_WARN("Collada: Unknown image file format");
+                }

-                    XmlParser::getValueAsString(hexChild, value);
-                    const char *data = value.c_str();
-                    // hexadecimal-encoded binary octets. First of all, find the
-                    // required buffer size to reserve enough storage.
-                    const char *cur = data;
-                    while (!IsSpaceOrNewLine(*cur)) {
-                        ++cur;
-                    }
+                XmlParser::getValueAsString(hexChild, value);
+                const char *data = value.c_str();
+                // hexadecimal-encoded binary octets. First of all, find the
+                // required buffer size to reserve enough storage.
+                const char *cur = data;
+                while (!IsSpaceOrNewLine(*cur)) {
+                    ++cur;
+                }

-                    const unsigned int size = (unsigned int)(cur - data) * 2;
-                    pImage.mImageData.resize(size);
-                    for (unsigned int i = 0; i < size; ++i) {
-                        pImage.mImageData[i] = HexOctetToDecimal(data + (i << 1));
-                    }
+                const unsigned int size = (unsigned int)(cur - data) * 2;
+                pImage.mImageData.resize(size);
+                for (unsigned int i = 0; i < size; ++i) {
+                    pImage.mImageData[i] = HexOctetToDecimal(data + (i << 1));
                }
            }
        }
@ -957,45 +950,44 @@ void ColladaParser::ReadLight(XmlNode &node, Collada::Light &pLight) {
            std::string v;
            XmlParser::getValueAsString(currentNode, v);
            const char *content = v.c_str();
-            const char *end = content + v.size();

            content = fast_atoreal_move<ai_real>(content, (ai_real &)pLight.mColor.r);
-            SkipSpacesAndLineEnd(&content, end);
+            SkipSpacesAndLineEnd(&content);

            content = fast_atoreal_move<ai_real>(content, (ai_real &)pLight.mColor.g);
-            SkipSpacesAndLineEnd(&content, end);
+            SkipSpacesAndLineEnd(&content);

            content = fast_atoreal_move<ai_real>(content, (ai_real &)pLight.mColor.b);
-            SkipSpacesAndLineEnd(&content, end);
+            SkipSpacesAndLineEnd(&content);
        } else if (currentName == "constant_attenuation") {
-            XmlParser::getValueAsReal(currentNode, pLight.mAttConstant);
+            XmlParser::getValueAsFloat(currentNode, pLight.mAttConstant);
        } else if (currentName == "linear_attenuation") {
-            XmlParser::getValueAsReal(currentNode, pLight.mAttLinear);
+            XmlParser::getValueAsFloat(currentNode, pLight.mAttLinear);
        } else if (currentName == "quadratic_attenuation") {
-            XmlParser::getValueAsReal(currentNode, pLight.mAttQuadratic);
+            XmlParser::getValueAsFloat(currentNode, pLight.mAttQuadratic);
        } else if (currentName == "falloff_angle") {
-            XmlParser::getValueAsReal(currentNode, pLight.mFalloffAngle);
+            XmlParser::getValueAsFloat(currentNode, pLight.mFalloffAngle);
        } else if (currentName == "falloff_exponent") {
-            XmlParser::getValueAsReal(currentNode, pLight.mFalloffExponent);
+            XmlParser::getValueAsFloat(currentNode, pLight.mFalloffExponent);
        }
        // FCOLLADA extensions
        // -------------------------------------------------------
        else if (currentName == "outer_cone") {
-            XmlParser::getValueAsReal(currentNode, pLight.mOuterAngle);
+            XmlParser::getValueAsFloat(currentNode, pLight.mOuterAngle);
        } else if (currentName == "penumbra_angle") { // this one is deprecated, now calculated using outer_cone
-            XmlParser::getValueAsReal(currentNode, pLight.mPenumbraAngle);
+            XmlParser::getValueAsFloat(currentNode, pLight.mPenumbraAngle);
        } else if (currentName == "intensity") {
-            XmlParser::getValueAsReal(currentNode, pLight.mIntensity);
+            XmlParser::getValueAsFloat(currentNode, pLight.mIntensity);
        }
        else if (currentName == "falloff") {
-            XmlParser::getValueAsReal(currentNode, pLight.mOuterAngle);
+            XmlParser::getValueAsFloat(currentNode, pLight.mOuterAngle);
        } else if (currentName == "hotspot_beam") {
-            XmlParser::getValueAsReal(currentNode, pLight.mFalloffAngle);
+            XmlParser::getValueAsFloat(currentNode, pLight.mFalloffAngle);
        }
        // OpenCOLLADA extensions
        // -------------------------------------------------------
        else if (currentName == "decay_falloff") {
-            XmlParser::getValueAsReal(currentNode, pLight.mOuterAngle);
+            XmlParser::getValueAsFloat(currentNode, pLight.mOuterAngle);
        }
    }
 }
@ -1010,15 +1002,15 @@ void ColladaParser::ReadCamera(XmlNode &node, Collada::Camera &camera) {
        if (currentName == "orthographic") {
            camera.mOrtho = true;
        } else if (currentName == "xfov" || currentName == "xmag") {
-            XmlParser::getValueAsReal(currentNode, camera.mHorFov);
+            XmlParser::getValueAsFloat(currentNode, camera.mHorFov);
        } else if (currentName == "yfov" || currentName == "ymag") {
-            XmlParser::getValueAsReal(currentNode, camera.mVerFov);
+            XmlParser::getValueAsFloat(currentNode, camera.mVerFov);
        } else if (currentName == "aspect_ratio") {
-            XmlParser::getValueAsReal(currentNode, camera.mAspect);
+            XmlParser::getValueAsFloat(currentNode, camera.mAspect);
        } else if (currentName == "znear") {
-            XmlParser::getValueAsReal(currentNode, camera.mZNear);
+            XmlParser::getValueAsFloat(currentNode, camera.mZNear);
        } else if (currentName == "zfar") {
-            XmlParser::getValueAsReal(currentNode, camera.mZFar);
+            XmlParser::getValueAsFloat(currentNode, camera.mZFar);
        }
    }
 }
@ -1170,15 +1162,15 @@ void ColladaParser::ReadSamplerProperties(XmlNode &node, Sampler &out) {
        } else if (currentName == "mirrorV") {
            XmlParser::getValueAsBool(currentNode, out.mMirrorV);
        } else if (currentName == "repeatU") {
-            XmlParser::getValueAsReal(currentNode, out.mTransform.mScaling.x);
+            XmlParser::getValueAsFloat(currentNode, out.mTransform.mScaling.x);
        } else if (currentName == "repeatV") {
-            XmlParser::getValueAsReal(currentNode, out.mTransform.mScaling.y);
+            XmlParser::getValueAsFloat(currentNode, out.mTransform.mScaling.y);
        } else if (currentName == "offsetU") {
-            XmlParser::getValueAsReal(currentNode, out.mTransform.mTranslation.x);
+            XmlParser::getValueAsFloat(currentNode, out.mTransform.mTranslation.x);
        } else if (currentName == "offsetV") {
-            XmlParser::getValueAsReal(currentNode, out.mTransform.mTranslation.y);
+            XmlParser::getValueAsFloat(currentNode, out.mTransform.mTranslation.y);
        } else if (currentName == "rotateUV") {
-            XmlParser::getValueAsReal(currentNode, out.mTransform.mRotation);
+            XmlParser::getValueAsFloat(currentNode, out.mTransform.mRotation);
        } else if (currentName == "blend_mode") {
            std::string v;
            XmlParser::getValueAsString(currentNode, v);
@ -1198,14 +1190,14 @@ void ColladaParser::ReadSamplerProperties(XmlNode &node, Sampler &out) {
        // OKINO extensions
        // -------------------------------------------------------
        else if (currentName == "weighting") {
-            XmlParser::getValueAsReal(currentNode, out.mWeighting);
+            XmlParser::getValueAsFloat(currentNode, out.mWeighting);
        } else if (currentName == "mix_with_previous_layer") {
-            XmlParser::getValueAsReal(currentNode, out.mMixWithPrevious);
+            XmlParser::getValueAsFloat(currentNode, out.mMixWithPrevious);
        }
        // MAX3D extensions
        // -------------------------------------------------------
        else if (currentName == "amount") {
-            XmlParser::getValueAsReal(currentNode, out.mWeighting);
+            XmlParser::getValueAsFloat(currentNode, out.mWeighting);
        }
    }
 }
@ -1226,19 +1218,18 @@ void ColladaParser::ReadEffectColor(XmlNode &node, aiColor4D &pColor, Sampler &p
            std::string v;
            XmlParser::getValueAsString(currentNode, v);
            const char *content = v.c_str();
-            const char *end = v.c_str() + v.size() + 1; 

            content = fast_atoreal_move<ai_real>(content, (ai_real &)pColor.r);
-            SkipSpacesAndLineEnd(&content, end);
+            SkipSpacesAndLineEnd(&content);

            content = fast_atoreal_move<ai_real>(content, (ai_real &)pColor.g);
-            SkipSpacesAndLineEnd(&content, end);
+            SkipSpacesAndLineEnd(&content);

            content = fast_atoreal_move<ai_real>(content, (ai_real &)pColor.b);
-            SkipSpacesAndLineEnd(&content, end);
+            SkipSpacesAndLineEnd(&content);

            content = fast_atoreal_move<ai_real>(content, (ai_real &)pColor.a);
-            SkipSpacesAndLineEnd(&content, end);
+            SkipSpacesAndLineEnd(&content);
        } else if (currentName == "texture") {
            // get name of source texture/sampler
            XmlParser::getStdStrAttribute(currentNode, "texture", pSampler.mName);
@ -1265,13 +1256,13 @@ void ColladaParser::ReadEffectColor(XmlNode &node, aiColor4D &pColor, Sampler &p

 // ------------------------------------------------------------------------------------------------
 // Reads an effect entry containing a float
-void ColladaParser::ReadEffectFloat(XmlNode &node, ai_real &pReal) {
-    pReal = 0.f;
+void ColladaParser::ReadEffectFloat(XmlNode &node, ai_real &pFloat) {
+    pFloat = 0.f;
    XmlNode floatNode = node.child("float");
    if (floatNode.empty()) {
        return;
    }
-    XmlParser::getValueAsReal(floatNode, pReal);
+    XmlParser::getValueAsFloat(floatNode, pFloat);
 }

 // ------------------------------------------------------------------------------------------------
@ -1281,7 +1272,9 @@ void ColladaParser::ReadEffectParam(XmlNode &node, Collada::EffectParam &pParam)
        return;
    }

-    for (XmlNode &currentNode : node.children()) {
+    XmlNodeIterator xmlIt(node, XmlNodeIterator::PreOrderMode);
+    XmlNode currentNode;
+    while (xmlIt.getNext(currentNode)) {
        const std::string &currentName = currentNode.name();
        if (currentName == "surface") {
            // image ID given inside <init_from> tags
@ -1294,24 +1287,22 @@ void ColladaParser::ReadEffectParam(XmlNode &node, Collada::EffectParam &pParam)
            }
        } else if (currentName == "sampler2D" && (FV_1_4_n == mFormat || FV_1_3_n == mFormat)) {
            // surface ID is given inside <source> tags
-            XmlNode source = currentNode.child("source");
-            if (source) {
-                std::string v;
-                XmlParser::getValueAsString(source, v);
-                pParam.mType = Param_Sampler;
-                pParam.mReference = v.c_str();
-            }
+            const char *content = currentNode.value();
+            pParam.mType = Param_Sampler;
+            pParam.mReference = content;
        } else if (currentName == "sampler2D") {
            // surface ID is given inside <instance_image> tags
-            XmlNode instance_image = currentNode.child("instance_image");
-            if (instance_image) {
-                std::string url;
-                XmlParser::getStdStrAttribute(instance_image, "url", url);
-                if (url[0] != '#') {
-                    throw DeadlyImportError("Unsupported URL format in instance_image");
-                }
-                pParam.mType = Param_Sampler;
-                pParam.mReference = url.c_str() + 1;
+            std::string url;
+            XmlParser::getStdStrAttribute(currentNode, "url", url);
+            if (url[0] != '#') {
+                throw DeadlyImportError("Unsupported URL format in instance_image");
+            }
+            pParam.mType = Param_Sampler;
+            pParam.mReference = url.c_str() + 1;
+        } else if (currentName == "source") {
+            const char *source = currentNode.child_value();
+            if (nullptr != source) {
+                pParam.mReference = source;
            }
        }
    }
@ -1352,7 +1343,6 @@ void ColladaParser::ReadGeometry(XmlNode &node, Collada::Mesh &pMesh) {
    if (node.empty()) {
        return;
    }
-    
    for (XmlNode &currentNode : node.children()) {
        const std::string &currentName = currentNode.name();
        if (currentName == "mesh") {
@ -1423,7 +1413,6 @@ void ColladaParser::ReadDataArray(XmlNode &node) {
    XmlParser::getValueAsString(node, v);
    v = ai_trim(v);
    const char *content = v.c_str();
-    const char *end = content + v.size();

    // read values and store inside an array in the data library
    mDataLibrary[id] = Data();
@ -1442,13 +1431,11 @@ void ColladaParser::ReadDataArray(XmlNode &node) {
                }

                s.clear();
-                while (!IsSpaceOrNewLine(*content)) {
-                    s += *content;
-                    content++;
-                }
+                while (!IsSpaceOrNewLine(*content))
+                    s += *content++;
                data.mStrings.push_back(s);

-                SkipSpacesAndLineEnd(&content, end);
+                SkipSpacesAndLineEnd(&content);
            }
        } else {
            data.mValues.reserve(count);
@ -1463,7 +1450,7 @@ void ColladaParser::ReadDataArray(XmlNode &node) {
                content = fast_atoreal_move<ai_real>(content, value);
                data.mValues.push_back(value);
                // skip whitespace after it
-                SkipSpacesAndLineEnd(&content, end);
+                SkipSpacesAndLineEnd(&content);
            }
        }
    }
@ -1628,10 +1615,8 @@ void ColladaParser::ReadIndexData(XmlNode &node, Mesh &pMesh) {
                    std::string v;
                    XmlParser::getValueAsString(currentNode, v);
                    const char *content = v.c_str();
-                    const char *end = content + v.size();
-
                    vcount.reserve(numPrimitives);
-                    SkipSpacesAndLineEnd(&content, end);
+                    SkipSpacesAndLineEnd(&content);
                    for (unsigned int a = 0; a < numPrimitives; a++) {
                        if (*content == 0) {
                            throw DeadlyImportError("Expected more values while reading <vcount> contents.");
@ -1639,7 +1624,7 @@ void ColladaParser::ReadIndexData(XmlNode &node, Mesh &pMesh) {
                        // read a number
                        vcount.push_back((size_t)strtoul10(content, &content));
                        // skip whitespace after it
-                        SkipSpacesAndLineEnd(&content, end);
+                        SkipSpacesAndLineEnd(&content);
                    }
                }
            }
@ -1748,16 +1733,14 @@ size_t ColladaParser::ReadPrimitives(XmlNode &node, Mesh &pMesh, std::vector<Inp
        std::string v;
        XmlParser::getValueAsString(node, v);
        const char *content = v.c_str();
-        const char *end = content + v.size();
-
-        SkipSpacesAndLineEnd(&content, end);
+        SkipSpacesAndLineEnd(&content);
        while (*content != 0) {
            // read a value.
            // Hack: (thom) Some exporters put negative indices sometimes. We just try to carry on anyways.
            int value = std::max(0, strtol10(content, &content));
            indices.push_back(size_t(value));
            // skip whitespace after it
-            SkipSpacesAndLineEnd(&content, end);
+            SkipSpacesAndLineEnd(&content);
        }
    }

@ -1787,10 +1770,6 @@ size_t ColladaParser::ReadPrimitives(XmlNode &node, Mesh &pMesh, std::vector<Inp
        const Accessor *acc = input.mResolved;
        if (!acc->mData) {
            acc->mData = &ResolveLibraryReference(mDataLibrary, acc->mSource);
-            const size_t dataSize = acc->mOffset + acc->mCount * acc->mStride;
-            if (dataSize > acc->mData->mValues.size()) {
-                throw DeadlyImportError("Not enough data for accessor");
-            }
        }
    }
    // and the same for the per-index channels
@ -1815,19 +1794,13 @@ size_t ColladaParser::ReadPrimitives(XmlNode &node, Mesh &pMesh, std::vector<Inp
        const Accessor *acc = input.mResolved;
        if (!acc->mData) {
            acc->mData = &ResolveLibraryReference(mDataLibrary, acc->mSource);
-            const size_t dataSize = acc->mOffset + acc->mCount * acc->mStride;
-            if (dataSize > acc->mData->mValues.size()) {
-                throw DeadlyImportError("Not enough data for accessor");
-            }
        }
    }

    // For continued primitives, the given count does not come all in one <p>, but only one primitive per <p>
    size_t numPrimitives = pNumPrimitives;
-    if (pPrimType == Prim_TriFans || pPrimType == Prim_Polygon) {
+    if (pPrimType == Prim_TriFans || pPrimType == Prim_Polygon)
        numPrimitives = 1;
-    }
-
    // For continued primitives, the given count is actually the number of <p>'s inside the parent tag
    if (pPrimType == Prim_TriStrips) {
        size_t numberOfVertices = indices.size() / numOffsets;
@ -1880,6 +1853,7 @@ size_t ColladaParser::ReadPrimitives(XmlNode &node, Mesh &pMesh, std::vector<Inp
        default:
            // LineStrip is not supported due to expected index unmangling
            throw DeadlyImportError("Unsupported primitive type.");
+            break;
        }

        // store the face size to later reconstruct the face from
@ -1892,7 +1866,7 @@ size_t ColladaParser::ReadPrimitives(XmlNode &node, Mesh &pMesh, std::vector<Inp

 ///@note This function won't work correctly if both PerIndex and PerVertex channels have same channels.
 ///For example if TEXCOORD present in both <vertices> and <polylist> tags this function will create wrong uv coordinates.
-///It's not clear from COLLADA documentation whether this is allowed or not. For now only exporter fixed to avoid such behavior
+///It's not clear from COLLADA documentation is this allowed or not. For now only exporter fixed to avoid such behavior
 void ColladaParser::CopyVertex(size_t currentVertex, size_t numOffsets, size_t numPoints, size_t perVertexOffset, Mesh &pMesh,
        std::vector<InputChannel> &pPerIndexChannels, size_t currentPrimitive, const std::vector<size_t> &indices) {
    // calculate the base offset of the vertex whose attributes we ant to copy
@ -1955,7 +1929,7 @@ void ColladaParser::ExtractDataObjectFromChannel(const InputChannel &pInput, siz
    switch (pInput.mType) {
    case IT_Position: // ignore all position streams except 0 - there can be only one position
        if (pInput.mIndex == 0) {
-            pMesh.mPositions.emplace_back(obj[0], obj[1], obj[2]);
+            pMesh.mPositions.push_back(aiVector3D(obj[0], obj[1], obj[2]));
        } else {
            ASSIMP_LOG_ERROR("Collada: just one vertex position stream supported");
        }
@ -1967,7 +1941,7 @@ void ColladaParser::ExtractDataObjectFromChannel(const InputChannel &pInput, siz

        // ignore all normal streams except 0 - there can be only one normal
        if (pInput.mIndex == 0) {
-            pMesh.mNormals.emplace_back(obj[0], obj[1], obj[2]);
+            pMesh.mNormals.push_back(aiVector3D(obj[0], obj[1], obj[2]));
        } else {
            ASSIMP_LOG_ERROR("Collada: just one vertex normal stream supported");
        }
@ -1979,7 +1953,7 @@ void ColladaParser::ExtractDataObjectFromChannel(const InputChannel &pInput, siz

        // ignore all tangent streams except 0 - there can be only one tangent
        if (pInput.mIndex == 0) {
-            pMesh.mTangents.emplace_back(obj[0], obj[1], obj[2]);
+            pMesh.mTangents.push_back(aiVector3D(obj[0], obj[1], obj[2]));
        } else {
            ASSIMP_LOG_ERROR("Collada: just one vertex tangent stream supported");
        }
@ -1992,7 +1966,7 @@ void ColladaParser::ExtractDataObjectFromChannel(const InputChannel &pInput, siz

        // ignore all bitangent streams except 0 - there can be only one bitangent
        if (pInput.mIndex == 0) {
-            pMesh.mBitangents.emplace_back(obj[0], obj[1], obj[2]);
+            pMesh.mBitangents.push_back(aiVector3D(obj[0], obj[1], obj[2]));
        } else {
            ASSIMP_LOG_ERROR("Collada: just one vertex bitangent stream supported");
        }
@ -2005,7 +1979,7 @@ void ColladaParser::ExtractDataObjectFromChannel(const InputChannel &pInput, siz
                pMesh.mTexCoords[pInput.mIndex].insert(pMesh.mTexCoords[pInput.mIndex].end(),
                        pMesh.mPositions.size() - pMesh.mTexCoords[pInput.mIndex].size() - 1, aiVector3D(0, 0, 0));

-            pMesh.mTexCoords[pInput.mIndex].emplace_back(obj[0], obj[1], obj[2]);
+            pMesh.mTexCoords[pInput.mIndex].push_back(aiVector3D(obj[0], obj[1], obj[2]));
            if (0 != acc.mSubOffset[2] || 0 != acc.mSubOffset[3]) {
                pMesh.mNumUVComponents[pInput.mIndex] = 3;
            }
@ -2139,7 +2113,7 @@ void ColladaParser::ReadSceneNode(XmlNode &node, Node *pNode) {
                if (s[0] != '#') {
                    ASSIMP_LOG_ERROR("Collada: Unresolved reference format of node");
                } else {
-                    pNode->mNodeInstances.emplace_back();
+                    pNode->mNodeInstances.push_back(NodeInstance());
                    pNode->mNodeInstances.back().mNode = s.c_str() + 1;
                }
            }
@ -2155,7 +2129,7 @@ void ColladaParser::ReadSceneNode(XmlNode &node, Node *pNode) {
                    throw DeadlyImportError("Unknown reference format in <instance_light> element");
                }

-                pNode->mLights.emplace_back();
+                pNode->mLights.push_back(LightInstance());
                pNode->mLights.back().mLight = url.c_str() + 1;
            }
        } else if (currentName == "instance_camera") {
@ -2166,7 +2140,7 @@ void ColladaParser::ReadSceneNode(XmlNode &node, Node *pNode) {
                if (url[0] != '#') {
                    throw DeadlyImportError("Unknown reference format in <instance_camera> element");
                }
-                pNode->mCameras.emplace_back();
+                pNode->mCameras.push_back(CameraInstance());
                pNode->mCameras.back().mCamera = url.c_str() + 1;
            }
        }
@ -2191,15 +2165,15 @@ void ColladaParser::ReadNodeTransformation(XmlNode &node, Node *pNode, Transform
    }

    // how many parameters to read per transformation type
-    static constexpr unsigned int sNumParameters[] = { 9, 4, 3, 3, 7, 16 };
+    static const unsigned int sNumParameters[] = { 9, 4, 3, 3, 7, 16 };
    std::string value;
    XmlParser::getValueAsString(node, value);
    const char *content = value.c_str();
-    const char *end = value.c_str() + value.size();
+
    // read as many parameters and store in the transformation
    for (unsigned int a = 0; a < sNumParameters[pType]; a++) {
        // skip whitespace before the number
-        SkipSpacesAndLineEnd(&content, end);
+        SkipSpacesAndLineEnd(&content);
        // read a number
        content = fast_atoreal_move<ai_real>(content, tf.f[a]);
    }
@ -2293,9 +2267,9 @@ void ColladaParser::ReadNodeGeometry(XmlNode &node, Node *pNode) {
                            urlMat++;

                        s.mMatName = urlMat;
-                        ReadMaterialVertexInputBinding(instanceMatNode, s);
                        // store the association
                        instance.mMaterials[group] = s;
+                        ReadMaterialVertexInputBinding(instanceMatNode, s);
                    }
                }
            }
@ -2331,7 +2305,7 @@ void ColladaParser::ReadScene(XmlNode &node) {
            // find the referred scene, skip the leading #
            NodeLibrary::const_iterator sit = mNodeLibrary.find(url.c_str() + 1);
            if (sit == mNodeLibrary.end()) {
-                throw DeadlyImportError("Unable to resolve visual_scene reference \"", std::string(std::move(url)), "\" in <instance_visual_scene> element.");
+                throw DeadlyImportError("Unable to resolve visual_scene reference \"", std::string(url), "\" in <instance_visual_scene> element.");
            }
            mRootNode = sit->second;
        }
--- a/code/AssetLib/Collada/ColladaParser.h
+++ b/code/AssetLib/Collada/ColladaParser.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

- Copyright (c) 2006-2024, assimp team
+ Copyright (c) 2006-2022, assimp team

 All rights reserved.

--- a/code/AssetLib/DXF/DXFHelper.h
+++ b/code/AssetLib/DXF/DXFHelper.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team


 All rights reserved.
@ -65,6 +65,7 @@ public:
    LineReader(StreamReaderLE& reader)
    : splitter(reader,false,true)
    , groupcode( 0 )
+    , value()
    , end() {
        // empty
    }
@ -185,7 +186,8 @@ struct InsertBlock {
    InsertBlock()
    : pos()
    , scale(1.f,1.f,1.f)
-    , angle() {
+    , angle()
+    , name() {
        // empty
    }

--- a/code/AssetLib/DXF/DXFLoader.cpp
+++ b/code/AssetLib/DXF/DXFLoader.cpp
@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -43,6 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *  @brief Implementation of the DXF importer class
 */

+
 #ifndef ASSIMP_BUILD_NO_DXF_IMPORTER

 #include "AssetLib/DXF/DXFLoader.h"
@ -56,7 +57,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/importerdesc.h>

 #include <numeric>
-#include <utility>

 using namespace Assimp;

@ -67,269 +67,26 @@ static constexpr size_t AI_DXF_BINARY_IDENT_LEN = sizeof AI_DXF_BINARY_IDENT;
 // default vertex color that all uncolored vertices will receive
 static const aiColor4D AI_DXF_DEFAULT_COLOR(aiColor4D(0.6f, 0.6f, 0.6f, 0.6f));

-// color indices for DXF - 256 are supported, the table is
-// taken directly from the AutoCad Index (ACI) table
-// https://gohtx.com/acadcolors.php
-//STH 2024-0126
-static const aiColor4D g_aclrDxfIndexColors[256] = {
-    aiColor4D (0.0f, 0.0f ,0.0f, 1.0f), //dxf color code 0
-    aiColor4D (1.0f, 0.0f ,0.0f, 1.0f), //dxf color code 1
-    aiColor4D (1.0f, 1.0f ,0.0f, 1.0f), //dxf color code 2
-    aiColor4D (0.0f, 1.0f ,0.0f, 1.0f), //dxf color code 3
-    aiColor4D (0.0f, 1.0f ,1.0f, 1.0f), //dxf color code 4
-    aiColor4D (0.0f, 0.0f ,1.0f, 1.0f), //dxf color code 5
-    aiColor4D (1.0f, 0.0f ,1.0f, 1.0f), //dxf color code 6
-    aiColor4D (1.0f, 1.0f ,1.0f, 1.0f), //dxf color code 7
-    aiColor4D (0.3f, 0.3f ,0.3f, 1.0f), //dxf color code 8
-    aiColor4D (0.5f, 0.5f ,0.5f, 1.0f), //dxf color code 9
-    aiColor4D (1.0f, 0.0f ,0.0f, 1.0f), //dxf color code 10
-    aiColor4D (1.0f, 0.7f ,0.7f, 1.0f), //dxf color code 11
-    aiColor4D (0.7f, 0.0f ,0.0f, 1.0f), //dxf color code 12
-    aiColor4D (0.7f, 0.5f ,0.5f, 1.0f), //dxf color code 13
-    aiColor4D (0.5f, 0.0f ,0.0f, 1.0f), //dxf color code 14
-    aiColor4D (0.5f, 0.3f ,0.3f, 1.0f), //dxf color code 15
-    aiColor4D (0.4f, 0.0f ,0.0f, 1.0f), //dxf color code 16
-    aiColor4D (0.4f, 0.3f ,0.3f, 1.0f), //dxf color code 17
-    aiColor4D (0.3f, 0.0f ,0.0f, 1.0f), //dxf color code 18
-    aiColor4D (0.3f, 0.2f ,0.2f, 1.0f), //dxf color code 19
-    aiColor4D (1.0f, 0.2f ,0.0f, 1.0f), //dxf color code 20
-    aiColor4D (1.0f, 0.7f ,0.7f, 1.0f), //dxf color code 21
-    aiColor4D (0.7f, 0.2f ,0.0f, 1.0f), //dxf color code 22
-    aiColor4D (0.7f, 0.6f ,0.5f, 1.0f), //dxf color code 23
-    aiColor4D (0.5f, 0.1f ,0.0f, 1.0f), //dxf color code 24
-    aiColor4D (0.5f, 0.4f ,0.3f, 1.0f), //dxf color code 25
-    aiColor4D (0.4f, 0.1f ,0.0f, 1.0f), //dxf color code 26
-    aiColor4D (0.4f, 0.3f ,0.3f, 1.0f), //dxf color code 27
-    aiColor4D (0.3f, 0.1f ,0.0f, 1.0f), //dxf color code 28
-    aiColor4D (0.3f, 0.2f ,0.2f, 1.0f), //dxf color code 29
-    aiColor4D (1.0f, 0.5f ,0.0f, 1.0f), //dxf color code 30
-    aiColor4D (1.0f, 0.8f ,0.7f, 1.0f), //dxf color code 31
-    aiColor4D (0.7f, 0.4f ,0.0f, 1.0f), //dxf color code 32
-    aiColor4D (0.7f, 0.6f ,0.5f, 1.0f), //dxf color code 33
-    aiColor4D (0.5f, 0.3f ,0.0f, 1.0f), //dxf color code 34
-    aiColor4D (0.5f, 0.4f ,0.3f, 1.0f), //dxf color code 35
-    aiColor4D (0.4f, 0.2f ,0.0f, 1.0f), //dxf color code 36
-    aiColor4D (0.4f, 0.3f ,0.3f, 1.0f), //dxf color code 37
-    aiColor4D (0.3f, 0.2f ,0.0f, 1.0f), //dxf color code 38
-    aiColor4D (0.3f, 0.3f ,0.2f, 1.0f), //dxf color code 39
-    aiColor4D (1.0f, 0.7f ,0.0f, 1.0f), //dxf color code 40
-    aiColor4D (1.0f, 0.9f ,0.7f, 1.0f), //dxf color code 41
-    aiColor4D (0.7f, 0.6f ,0.0f, 1.0f), //dxf color code 42
-    aiColor4D (0.7f, 0.7f ,0.5f, 1.0f), //dxf color code 43
-    aiColor4D (0.5f, 0.4f ,0.0f, 1.0f), //dxf color code 44
-    aiColor4D (0.5f, 0.5f ,0.3f, 1.0f), //dxf color code 45
-    aiColor4D (0.4f, 0.3f ,0.0f, 1.0f), //dxf color code 46
-    aiColor4D (0.4f, 0.4f ,0.3f, 1.0f), //dxf color code 47
-    aiColor4D (0.3f, 0.2f ,0.0f, 1.0f), //dxf color code 48
-    aiColor4D (0.3f, 0.3f ,0.2f, 1.0f), //dxf color code 49
-    aiColor4D (1.0f, 1.0f ,0.0f, 1.0f), //dxf color code 50
-    aiColor4D (1.0f, 1.0f ,0.7f, 1.0f), //dxf color code 51
-    aiColor4D (0.7f, 0.7f ,0.0f, 1.0f), //dxf color code 52
-    aiColor4D (0.7f, 0.7f ,0.5f, 1.0f), //dxf color code 53
-    aiColor4D (0.5f, 0.5f ,0.0f, 1.0f), //dxf color code 54
-    aiColor4D (0.5f, 0.5f ,0.3f, 1.0f), //dxf color code 55
-    aiColor4D (0.4f, 0.4f ,0.0f, 1.0f), //dxf color code 56
-    aiColor4D (0.4f, 0.4f ,0.3f, 1.0f), //dxf color code 57
-    aiColor4D (0.3f, 0.3f ,0.0f, 1.0f), //dxf color code 58
-    aiColor4D (0.3f, 0.3f ,0.2f, 1.0f), //dxf color code 59
-    aiColor4D (0.7f, 1.0f ,0.0f, 1.0f), //dxf color code 60
-    aiColor4D (0.9f, 1.0f ,0.7f, 1.0f), //dxf color code 61
-    aiColor4D (0.6f, 0.7f ,0.0f, 1.0f), //dxf color code 62
-    aiColor4D (0.7f, 0.7f ,0.5f, 1.0f), //dxf color code 63
-    aiColor4D (0.4f, 0.5f ,0.0f, 1.0f), //dxf color code 64
-    aiColor4D (0.5f, 0.5f ,0.3f, 1.0f), //dxf color code 65
-    aiColor4D (0.3f, 0.4f ,0.0f, 1.0f), //dxf color code 66
-    aiColor4D (0.4f, 0.4f ,0.3f, 1.0f), //dxf color code 67
-    aiColor4D (0.2f, 0.3f ,0.0f, 1.0f), //dxf color code 68
-    aiColor4D (0.3f, 0.3f ,0.2f, 1.0f), //dxf color code 69
-    aiColor4D (0.5f, 1.0f ,0.0f, 1.0f), //dxf color code 70
-    aiColor4D (0.8f, 1.0f ,0.7f, 1.0f), //dxf color code 71
-    aiColor4D (0.4f, 0.7f ,0.0f, 1.0f), //dxf color code 72
-    aiColor4D (0.6f, 0.7f ,0.5f, 1.0f), //dxf color code 73
-    aiColor4D (0.3f, 0.5f ,0.0f, 1.0f), //dxf color code 74
-    aiColor4D (0.4f, 0.5f ,0.3f, 1.0f), //dxf color code 75
-    aiColor4D (0.2f, 0.4f ,0.0f, 1.0f), //dxf color code 76
-    aiColor4D (0.3f, 0.4f ,0.3f, 1.0f), //dxf color code 77
-    aiColor4D (0.2f, 0.3f ,0.0f, 1.0f), //dxf color code 78
-    aiColor4D (0.3f, 0.3f ,0.2f, 1.0f), //dxf color code 79
-    aiColor4D (0.2f, 1.0f ,0.0f, 1.0f), //dxf color code 80
-    aiColor4D (0.7f, 1.0f ,0.7f, 1.0f), //dxf color code 81
-    aiColor4D (0.2f, 0.7f ,0.0f, 1.0f), //dxf color code 82
-    aiColor4D (0.6f, 0.7f ,0.5f, 1.0f), //dxf color code 83
-    aiColor4D (0.1f, 0.5f ,0.0f, 1.0f), //dxf color code 84
-    aiColor4D (0.4f, 0.5f ,0.3f, 1.0f), //dxf color code 85
-    aiColor4D (0.1f, 0.4f ,0.0f, 1.0f), //dxf color code 86
-    aiColor4D (0.3f, 0.4f ,0.3f, 1.0f), //dxf color code 87
-    aiColor4D (0.1f, 0.3f ,0.0f, 1.0f), //dxf color code 88
-    aiColor4D (0.2f, 0.3f ,0.2f, 1.0f), //dxf color code 89
-    aiColor4D (0.0f, 1.0f ,0.0f, 1.0f), //dxf color code 90
-    aiColor4D (0.7f, 1.0f ,0.7f, 1.0f), //dxf color code 91
-    aiColor4D (0.0f, 0.7f ,0.0f, 1.0f), //dxf color code 92
-    aiColor4D (0.5f, 0.7f ,0.5f, 1.0f), //dxf color code 93
-    aiColor4D (0.0f, 0.5f ,0.0f, 1.0f), //dxf color code 94
-    aiColor4D (0.3f, 0.5f ,0.3f, 1.0f), //dxf color code 95
-    aiColor4D (0.0f, 0.4f ,0.0f, 1.0f), //dxf color code 96
-    aiColor4D (0.3f, 0.4f ,0.3f, 1.0f), //dxf color code 97
-    aiColor4D (0.0f, 0.3f ,0.0f, 1.0f), //dxf color code 98
-    aiColor4D (0.2f, 0.3f ,0.2f, 1.0f), //dxf color code 99
-    aiColor4D (0.0f, 1.0f ,0.2f, 1.0f), //dxf color code 100
-    aiColor4D (0.7f, 1.0f ,0.7f, 1.0f), //dxf color code 101
-    aiColor4D (0.0f, 0.7f ,0.2f, 1.0f), //dxf color code 102
-    aiColor4D (0.5f, 0.7f ,0.6f, 1.0f), //dxf color code 103
-    aiColor4D (0.0f, 0.5f ,0.1f, 1.0f), //dxf color code 104
-    aiColor4D (0.3f, 0.5f ,0.4f, 1.0f), //dxf color code 105
-    aiColor4D (0.0f, 0.4f ,0.1f, 1.0f), //dxf color code 106
-    aiColor4D (0.3f, 0.4f ,0.3f, 1.0f), //dxf color code 107
-    aiColor4D (0.0f, 0.3f ,0.1f, 1.0f), //dxf color code 108
-    aiColor4D (0.2f, 0.3f ,0.2f, 1.0f), //dxf color code 109
-    aiColor4D (0.0f, 1.0f ,0.5f, 1.0f), //dxf color code 110
-    aiColor4D (0.7f, 1.0f ,0.8f, 1.0f), //dxf color code 111
-    aiColor4D (0.0f, 0.7f ,0.4f, 1.0f), //dxf color code 112
-    aiColor4D (0.5f, 0.7f ,0.6f, 1.0f), //dxf color code 113
-    aiColor4D (0.0f, 0.5f ,0.3f, 1.0f), //dxf color code 114
-    aiColor4D (0.3f, 0.5f ,0.4f, 1.0f), //dxf color code 115
-    aiColor4D (0.0f, 0.4f ,0.2f, 1.0f), //dxf color code 116
-    aiColor4D (0.3f, 0.4f ,0.3f, 1.0f), //dxf color code 117
-    aiColor4D (0.0f, 0.3f ,0.2f, 1.0f), //dxf color code 118
-    aiColor4D (0.2f, 0.3f ,0.3f, 1.0f), //dxf color code 119
-    aiColor4D (0.0f, 1.0f ,0.7f, 1.0f), //dxf color code 120
-    aiColor4D (0.7f, 1.0f ,0.9f, 1.0f), //dxf color code 121
-    aiColor4D (0.0f, 0.7f ,0.6f, 1.0f), //dxf color code 122
-    aiColor4D (0.5f, 0.7f ,0.7f, 1.0f), //dxf color code 123
-    aiColor4D (0.0f, 0.5f ,0.4f, 1.0f), //dxf color code 124
-    aiColor4D (0.3f, 0.5f ,0.5f, 1.0f), //dxf color code 125
-    aiColor4D (0.0f, 0.4f ,0.3f, 1.0f), //dxf color code 126
-    aiColor4D (0.3f, 0.4f ,0.4f, 1.0f), //dxf color code 127
-    aiColor4D (0.0f, 0.3f ,0.2f, 1.0f), //dxf color code 128
-    aiColor4D (0.2f, 0.3f ,0.3f, 1.0f), //dxf color code 129
-    aiColor4D (0.0f, 1.0f ,1.0f, 1.0f), //dxf color code 130
-    aiColor4D (0.7f, 1.0f ,1.0f, 1.0f), //dxf color code 131
-    aiColor4D (0.0f, 0.7f ,0.7f, 1.0f), //dxf color code 132
-    aiColor4D (0.5f, 0.7f ,0.7f, 1.0f), //dxf color code 133
-    aiColor4D (0.0f, 0.5f ,0.5f, 1.0f), //dxf color code 134
-    aiColor4D (0.3f, 0.5f ,0.5f, 1.0f), //dxf color code 135
-    aiColor4D (0.0f, 0.4f ,0.4f, 1.0f), //dxf color code 136
-    aiColor4D (0.3f, 0.4f ,0.4f, 1.0f), //dxf color code 137
-    aiColor4D (0.0f, 0.3f ,0.3f, 1.0f), //dxf color code 138
-    aiColor4D (0.2f, 0.3f ,0.3f, 1.0f), //dxf color code 139
-    aiColor4D (0.0f, 0.7f ,1.0f, 1.0f), //dxf color code 140
-    aiColor4D (0.7f, 0.9f ,1.0f, 1.0f), //dxf color code 141
-    aiColor4D (0.0f, 0.6f ,0.7f, 1.0f), //dxf color code 142
-    aiColor4D (0.5f, 0.7f ,0.7f, 1.0f), //dxf color code 143
-    aiColor4D (0.0f, 0.4f ,0.5f, 1.0f), //dxf color code 144
-    aiColor4D (0.3f, 0.5f ,0.5f, 1.0f), //dxf color code 145
-    aiColor4D (0.0f, 0.3f ,0.4f, 1.0f), //dxf color code 146
-    aiColor4D (0.3f, 0.4f ,0.4f, 1.0f), //dxf color code 147
-    aiColor4D (0.0f, 0.2f ,0.3f, 1.0f), //dxf color code 148
-    aiColor4D (0.2f, 0.3f ,0.3f, 1.0f), //dxf color code 149
-    aiColor4D (0.0f, 0.5f ,1.0f, 1.0f), //dxf color code 150
-    aiColor4D (0.7f, 0.8f ,1.0f, 1.0f), //dxf color code 151
-    aiColor4D (0.0f, 0.4f ,0.7f, 1.0f), //dxf color code 152
-    aiColor4D (0.5f, 0.6f ,0.7f, 1.0f), //dxf color code 153
-    aiColor4D (0.0f, 0.3f ,0.5f, 1.0f), //dxf color code 154
-    aiColor4D (0.3f, 0.4f ,0.5f, 1.0f), //dxf color code 155
-    aiColor4D (0.0f, 0.2f ,0.4f, 1.0f), //dxf color code 156
-    aiColor4D (0.3f, 0.3f ,0.4f, 1.0f), //dxf color code 157
-    aiColor4D (0.0f, 0.2f ,0.3f, 1.0f), //dxf color code 158
-    aiColor4D (0.2f, 0.3f ,0.3f, 1.0f), //dxf color code 159
-    aiColor4D (0.0f, 0.2f ,1.0f, 1.0f), //dxf color code 160
-    aiColor4D (0.7f, 0.7f ,1.0f, 1.0f), //dxf color code 161
-    aiColor4D (0.0f, 0.2f ,0.7f, 1.0f), //dxf color code 162
-    aiColor4D (0.5f, 0.6f ,0.7f, 1.0f), //dxf color code 163
-    aiColor4D (0.0f, 0.1f ,0.5f, 1.0f), //dxf color code 164
-    aiColor4D (0.3f, 0.4f ,0.5f, 1.0f), //dxf color code 165
-    aiColor4D (0.0f, 0.1f ,0.4f, 1.0f), //dxf color code 166
-    aiColor4D (0.3f, 0.3f ,0.4f, 1.0f), //dxf color code 167
-    aiColor4D (0.0f, 0.1f ,0.3f, 1.0f), //dxf color code 168
-    aiColor4D (0.2f, 0.2f ,0.3f, 1.0f), //dxf color code 169
-    aiColor4D (0.0f, 0.0f ,1.0f, 1.0f), //dxf color code 170
-    aiColor4D (0.7f, 0.7f ,1.0f, 1.0f), //dxf color code 171
-    aiColor4D (0.0f, 0.0f ,0.7f, 1.0f), //dxf color code 172
-    aiColor4D (0.5f, 0.5f ,0.7f, 1.0f), //dxf color code 173
-    aiColor4D (0.0f, 0.0f ,0.5f, 1.0f), //dxf color code 174
-    aiColor4D (0.3f, 0.3f ,0.5f, 1.0f), //dxf color code 175
-    aiColor4D (0.0f, 0.0f ,0.4f, 1.0f), //dxf color code 176
-    aiColor4D (0.3f, 0.3f ,0.4f, 1.0f), //dxf color code 177
-    aiColor4D (0.0f, 0.0f ,0.3f, 1.0f), //dxf color code 178
-    aiColor4D (0.2f, 0.2f ,0.3f, 1.0f), //dxf color code 179
-    aiColor4D (0.2f, 0.0f ,1.0f, 1.0f), //dxf color code 180
-    aiColor4D (0.7f, 0.7f ,1.0f, 1.0f), //dxf color code 181
-    aiColor4D (0.2f, 0.0f ,0.7f, 1.0f), //dxf color code 182
-    aiColor4D (0.6f, 0.5f ,0.7f, 1.0f), //dxf color code 183
-    aiColor4D (0.1f, 0.0f ,0.5f, 1.0f), //dxf color code 184
-    aiColor4D (0.4f, 0.3f ,0.5f, 1.0f), //dxf color code 185
-    aiColor4D (0.1f, 0.0f ,0.4f, 1.0f), //dxf color code 186
-    aiColor4D (0.3f, 0.3f ,0.4f, 1.0f), //dxf color code 187
-    aiColor4D (0.1f, 0.0f ,0.3f, 1.0f), //dxf color code 188
-    aiColor4D (0.2f, 0.2f ,0.3f, 1.0f), //dxf color code 189
-    aiColor4D (0.5f, 0.0f ,1.0f, 1.0f), //dxf color code 190
-    aiColor4D (0.8f, 0.7f ,1.0f, 1.0f), //dxf color code 191
-    aiColor4D (0.4f, 0.0f ,0.7f, 1.0f), //dxf color code 192
-    aiColor4D (0.6f, 0.5f ,0.7f, 1.0f), //dxf color code 193
-    aiColor4D (0.3f, 0.0f ,0.5f, 1.0f), //dxf color code 194
-    aiColor4D (0.4f, 0.3f ,0.5f, 1.0f), //dxf color code 195
-    aiColor4D (0.2f, 0.0f ,0.4f, 1.0f), //dxf color code 196
-    aiColor4D (0.3f, 0.3f ,0.4f, 1.0f), //dxf color code 197
-    aiColor4D (0.2f, 0.0f ,0.3f, 1.0f), //dxf color code 198
-    aiColor4D (0.3f, 0.2f ,0.3f, 1.0f), //dxf color code 199
-    aiColor4D (0.7f, 0.0f ,1.0f, 1.0f), //dxf color code 200
-    aiColor4D (0.9f, 0.7f ,1.0f, 1.0f), //dxf color code 201
-    aiColor4D (0.6f, 0.0f ,0.7f, 1.0f), //dxf color code 202
-    aiColor4D (0.7f, 0.5f ,0.7f, 1.0f), //dxf color code 203
-    aiColor4D (0.4f, 0.0f ,0.5f, 1.0f), //dxf color code 204
-    aiColor4D (0.5f, 0.3f ,0.5f, 1.0f), //dxf color code 205
-    aiColor4D (0.3f, 0.0f ,0.4f, 1.0f), //dxf color code 206
-    aiColor4D (0.4f, 0.3f ,0.4f, 1.0f), //dxf color code 207
-    aiColor4D (0.2f, 0.0f ,0.3f, 1.0f), //dxf color code 208
-    aiColor4D (0.3f, 0.2f ,0.3f, 1.0f), //dxf color code 209
-    aiColor4D (1.0f, 0.0f ,1.0f, 1.0f), //dxf color code 210
-    aiColor4D (1.0f, 0.7f ,1.0f, 1.0f), //dxf color code 211
-    aiColor4D (0.7f, 0.0f ,0.7f, 1.0f), //dxf color code 212
-    aiColor4D (0.7f, 0.5f ,0.7f, 1.0f), //dxf color code 213
-    aiColor4D (0.5f, 0.0f ,0.5f, 1.0f), //dxf color code 214
-    aiColor4D (0.5f, 0.3f ,0.5f, 1.0f), //dxf color code 215
-    aiColor4D (0.4f, 0.0f ,0.4f, 1.0f), //dxf color code 216
-    aiColor4D (0.4f, 0.3f ,0.4f, 1.0f), //dxf color code 217
-    aiColor4D (0.3f, 0.0f ,0.3f, 1.0f), //dxf color code 218
-    aiColor4D (0.3f, 0.2f ,0.3f, 1.0f), //dxf color code 219
-    aiColor4D (1.0f, 0.0f ,0.7f, 1.0f), //dxf color code 220
-    aiColor4D (1.0f, 0.7f ,0.9f, 1.0f), //dxf color code 221
-    aiColor4D (0.7f, 0.0f ,0.6f, 1.0f), //dxf color code 222
-    aiColor4D (0.7f, 0.5f ,0.7f, 1.0f), //dxf color code 223
-    aiColor4D (0.5f, 0.0f ,0.4f, 1.0f), //dxf color code 224
-    aiColor4D (0.5f, 0.3f ,0.5f, 1.0f), //dxf color code 225
-    aiColor4D (0.4f, 0.0f ,0.3f, 1.0f), //dxf color code 226
-    aiColor4D (0.4f, 0.3f ,0.4f, 1.0f), //dxf color code 227
-    aiColor4D (0.3f, 0.0f ,0.2f, 1.0f), //dxf color code 228
-    aiColor4D (0.3f, 0.2f ,0.3f, 1.0f), //dxf color code 229
-    aiColor4D (1.0f, 0.0f ,0.5f, 1.0f), //dxf color code 230
-    aiColor4D (1.0f, 0.7f ,0.8f, 1.0f), //dxf color code 231
-    aiColor4D (0.7f, 0.0f ,0.4f, 1.0f), //dxf color code 232
-    aiColor4D (0.7f, 0.5f ,0.6f, 1.0f), //dxf color code 233
-    aiColor4D (0.5f, 0.0f ,0.3f, 1.0f), //dxf color code 234
-    aiColor4D (0.5f, 0.3f ,0.4f, 1.0f), //dxf color code 235
-    aiColor4D (0.4f, 0.0f ,0.2f, 1.0f), //dxf color code 236
-    aiColor4D (0.4f, 0.3f ,0.3f, 1.0f), //dxf color code 237
-    aiColor4D (0.3f, 0.0f ,0.2f, 1.0f), //dxf color code 238
-    aiColor4D (0.3f, 0.2f ,0.3f, 1.0f), //dxf color code 239
-    aiColor4D (1.0f, 0.0f ,0.2f, 1.0f), //dxf color code 240
-    aiColor4D (1.0f, 0.7f ,0.7f, 1.0f), //dxf color code 241
-    aiColor4D (0.7f, 0.0f ,0.2f, 1.0f), //dxf color code 242
-    aiColor4D (0.7f, 0.5f ,0.6f, 1.0f), //dxf color code 243
-    aiColor4D (0.5f, 0.0f ,0.1f, 1.0f), //dxf color code 244
-    aiColor4D (0.5f, 0.3f ,0.4f, 1.0f), //dxf color code 245
-    aiColor4D (0.4f, 0.0f ,0.1f, 1.0f), //dxf color code 246
-    aiColor4D (0.4f, 0.3f ,0.3f, 1.0f), //dxf color code 247
-    aiColor4D (0.3f, 0.0f ,0.1f, 1.0f), //dxf color code 248
-    aiColor4D (0.3f, 0.2f ,0.2f, 1.0f), //dxf color code 249
-    aiColor4D (0.2f, 0.2f ,0.2f, 1.0f), //dxf color code 250
-    aiColor4D (0.3f, 0.3f ,0.3f, 1.0f), //dxf color code 251
-    aiColor4D (0.4f, 0.4f ,0.4f, 1.0f), //dxf color code 252
-    aiColor4D (0.5f, 0.5f ,0.5f, 1.0f), //dxf color code 253
-    aiColor4D (0.7f, 0.7f ,0.7f, 1.0f), //dxf color code 254
-    aiColor4D (1.0f, 1.0f ,1.0f, 1.0f) //dxf color code 255
+// color indices for DXF - 16 are supported, the table is
+// taken directly from the DXF spec.
+static aiColor4D g_aclrDxfIndexColors[] = {
+    aiColor4D (0.6f, 0.6f, 0.6f, 1.0f),
+    aiColor4D (1.0f, 0.0f, 0.0f, 1.0f), // red
+    aiColor4D (0.0f, 1.0f, 0.0f, 1.0f), // green
+    aiColor4D (0.0f, 0.0f, 1.0f, 1.0f), // blue
+    aiColor4D (0.3f, 1.0f, 0.3f, 1.0f), // light green
+    aiColor4D (0.3f, 0.3f, 1.0f, 1.0f), // light blue
+    aiColor4D (1.0f, 0.3f, 0.3f, 1.0f), // light red
+    aiColor4D (1.0f, 0.0f, 1.0f, 1.0f), // pink
+    aiColor4D (1.0f, 0.6f, 0.0f, 1.0f), // orange
+    aiColor4D (0.6f, 0.3f, 0.0f, 1.0f), // dark orange
+    aiColor4D (1.0f, 1.0f, 0.0f, 1.0f), // yellow
+    aiColor4D (0.3f, 0.3f, 0.3f, 1.0f), // dark gray
+    aiColor4D (0.8f, 0.8f, 0.8f, 1.0f), // light gray
+    aiColor4D (0.0f, 00.f, 0.0f, 1.0f), // black
+    aiColor4D (1.0f, 1.0f, 1.0f, 1.0f), // white
+    aiColor4D (0.6f, 0.0f, 1.0f, 1.0f)  // violet
 };
-
 #define AI_DXF_NUM_INDEX_COLORS (sizeof(g_aclrDxfIndexColors)/sizeof(g_aclrDxfIndexColors[0]))
 #define AI_DXF_ENTITIES_MAGIC_BLOCK "$ASSIMP_ENTITIES_MAGIC"

@ -338,7 +95,7 @@ static const int GroupCode_XComp = 10;
 static const int GroupCode_YComp = 20;
 static const int GroupCode_ZComp = 30;

-static constexpr aiImporterDesc desc = {
+static const aiImporterDesc desc = {
    "Drawing Interchange Format (DXF) Importer",
    "",
    "",
@ -351,6 +108,19 @@ static constexpr aiImporterDesc desc = {
    "dxf"
 };

+// ------------------------------------------------------------------------------------------------
+// Constructor to be privately used by Importer
+DXFImporter::DXFImporter()
+: BaseImporter() {
+    // empty
+}
+
+// ------------------------------------------------------------------------------------------------
+// Destructor, private as well
+DXFImporter::~DXFImporter() {
+    // empty
+}
+
 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
 bool DXFImporter::CanRead( const std::string& filename, IOSystem* pIOHandler, bool /*checkSig*/ ) const {
@ -370,7 +140,7 @@ void DXFImporter::InternReadFile( const std::string& filename, aiScene* pScene,
    std::shared_ptr<IOStream> file = std::shared_ptr<IOStream>( pIOHandler->Open( filename) );

    // Check whether we can read the file
-    if (file == nullptr) {
+    if( file.get() == nullptr ) {
        throw DeadlyImportError( "Failed to open DXF file ", filename, "");
    }

@ -385,7 +155,7 @@ void DXFImporter::InternReadFile( const std::string& filename, aiScene* pScene,
    // DXF files can grow very large, so read them via the StreamReader,
    // which will choose a suitable strategy.
    file->Seek(0,aiOrigin_SET);
-    StreamReaderLE stream( std::move(file) );
+    StreamReaderLE stream( file );

    DXF::LineReader reader (stream);
    DXF::FileData output;
@ -463,7 +233,7 @@ void DXFImporter::ConvertMeshes(aiScene* pScene, DXF::FileData& output) {
        ASSIMP_LOG_VERBOSE_DEBUG("DXF: Unexpanded polycount is ", icount, ", vertex count is ", vcount);
    }

-    if (output.blocks.empty()) {
+    if (! output.blocks.size()  ) {
        throw DeadlyImportError("DXF: no data blocks loaded");
    }

@ -605,7 +375,7 @@ void DXFImporter::ExpandBlockReferences(DXF::Block& bl,const DXF::BlockMap& bloc
                ASSIMP_LOG_ERROR("DXF: PolyLine instance is nullptr, skipping.");
                continue;
            }
-
+            
            std::shared_ptr<DXF::PolyLine> pl_out = std::shared_ptr<DXF::PolyLine>(new DXF::PolyLine(*pl_in));

            if (bl_src.base.Length() || insert.scale.x!=1.f || insert.scale.y!=1.f || insert.scale.z!=1.f || insert.angle || insert.pos.Length()) {
@ -613,12 +383,8 @@ void DXFImporter::ExpandBlockReferences(DXF::Block& bl,const DXF::BlockMap& bloc
                // XXX order
                aiMatrix4x4 trafo, tmp;
                aiMatrix4x4::Translation(-bl_src.base,trafo);
-                //Need to translate position before scaling the insert
-                //otherwise the position ends up being the position*scaling
-                //STH 2024.01.17
-                trafo *= aiMatrix4x4::Translation(insert.pos,tmp);
                trafo *= aiMatrix4x4::Scaling(insert.scale,tmp);
-                //trafo *= aiMatrix4x4::Translation(insert.pos,tmp);
+                trafo *= aiMatrix4x4::Translation(insert.pos,tmp);

                // XXX rotation currently ignored - I didn't find an appropriate sample model.
                if (insert.angle != 0.f) {
@ -709,7 +475,7 @@ void DXFImporter::ParseBlocks(DXF::LineReader& reader, DXF::FileData& output) {
 // ------------------------------------------------------------------------------------------------
 void DXFImporter::ParseBlock(DXF::LineReader& reader, DXF::FileData& output) {
    // push a new block onto the stack.
-    output.blocks.emplace_back();
+    output.blocks.push_back( DXF::Block() );
    DXF::Block& block = output.blocks.back();

    while( !reader.End() && !reader.Is(0,"ENDBLK")) {
@ -754,7 +520,7 @@ void DXFImporter::ParseBlock(DXF::LineReader& reader, DXF::FileData& output) {
 // ------------------------------------------------------------------------------------------------
 void DXFImporter::ParseEntities(DXF::LineReader& reader, DXF::FileData& output) {
    // Push a new block onto the stack.
-    output.blocks.emplace_back();
+    output.blocks.push_back( DXF::Block() );
    DXF::Block& block = output.blocks.back();

    block.name = AI_DXF_ENTITIES_MAGIC_BLOCK;
@ -784,7 +550,7 @@ void DXFImporter::ParseEntities(DXF::LineReader& reader, DXF::FileData& output)
 }

 void DXFImporter::ParseInsertion(DXF::LineReader& reader, DXF::FileData& output) {
-    output.blocks.back().insertions.emplace_back();
+    output.blocks.back().insertions.push_back( DXF::InsertBlock() );
    DXF::InsertBlock& bl = output.blocks.back().insertions.back();

    while( !reader.End() && !reader.Is(0)) {
@ -825,11 +591,10 @@ void DXFImporter::ParseInsertion(DXF::LineReader& reader, DXF::FileData& output)
    }
 }

-static constexpr unsigned int DXF_POLYLINE_FLAG_CLOSED = 0x1;
-// Currently unused
-//static constexpr unsigned int DXF_POLYLINE_FLAG_3D_POLYLINE = 0x8;
-//static constexpr unsigned int DXF_POLYLINE_FLAG_3D_POLYMESH = 0x10;
-static constexpr unsigned int DXF_POLYLINE_FLAG_POLYFACEMESH = 0x40;
+#define DXF_POLYLINE_FLAG_CLOSED        0x1
+#define DXF_POLYLINE_FLAG_3D_POLYLINE   0x8
+#define DXF_POLYLINE_FLAG_3D_POLYMESH   0x10
+#define DXF_POLYLINE_FLAG_POLYFACEMESH  0x40

 // ------------------------------------------------------------------------------------------------
 void DXFImporter::ParsePolyLine(DXF::LineReader& reader, DXF::FileData& output) {
@ -878,6 +643,12 @@ void DXFImporter::ParsePolyLine(DXF::LineReader& reader, DXF::FileData& output)
        reader++;
    }

+    //if (!(line.flags & DXF_POLYLINE_FLAG_POLYFACEMESH))   {
+    //  DefaultLogger::get()->warn((Formatter::format("DXF: polyline not currently supported: "),line.flags));
+    //  output.blocks.back().lines.pop_back();
+    //  return;
+    //}
+
    if (vguess && line.positions.size() != vguess) {
        ASSIMP_LOG_WARN("DXF: unexpected vertex count in polymesh: ",
            line.positions.size(),", expected ", vguess );
@ -967,18 +738,12 @@ void DXFImporter::ParsePolyLineVertex(DXF::LineReader& reader, DXF::PolyLine& li
        case 71:
        case 72:
        case 73:
-        case 74: {
-                if (cnti == 4) {
-                    ASSIMP_LOG_WARN("DXF: more than 4 indices per face not supported; ignoring");
-                    break;
-                }
-                const int index = reader.ValueAsSignedInt();
-                if (index >= 0) {
-                    indices[cnti++] = static_cast<unsigned int>(index);
-                } else {
-                    indices[cnti++] = static_cast<unsigned int>(-index);
-                }
+        case 74:
+            if (cnti == 4) {
+                ASSIMP_LOG_WARN("DXF: more than 4 indices per face not supported; ignoring");
+                break;
            }
+            indices[cnti++] = reader.ValueAsUnsignedInt();
            break;

        // color
@ -1016,7 +781,8 @@ void DXFImporter::ParsePolyLineVertex(DXF::LineReader& reader, DXF::PolyLine& li
 }

 // ------------------------------------------------------------------------------------------------
-void DXFImporter::Parse3DFace(DXF::LineReader& reader, DXF::FileData& output) {
+void DXFImporter::Parse3DFace(DXF::LineReader& reader, DXF::FileData& output)
+{
    // (note) this is also used for for parsing line entities, so we
    // must handle the vertex_count == 2 case as well.

@ -1033,7 +799,8 @@ void DXFImporter::Parse3DFace(DXF::LineReader& reader, DXF::FileData& output) {
        if (reader.GroupCode() == 0) {
            break;
        }
-        switch (reader.GroupCode()) {
+        switch (reader.GroupCode())
+        {

        // 8 specifies the layer
        case 8:
--- a/code/AssetLib/DXF/DXFLoader.h
+++ b/code/AssetLib/DXF/DXFLoader.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -68,8 +68,8 @@ namespace DXF {
 */
 class DXFImporter : public BaseImporter {
 public:
-    DXFImporter() = default;
-    ~DXFImporter() override = default;
+    DXFImporter();
+    ~DXFImporter() override;

    // -------------------------------------------------------------------
    /** Returns whether the class can handle the format of the given file.
--- a/code/AssetLib/FBX/FBXAnimation.cpp
+++ b/code/AssetLib/FBX/FBXAnimation.cpp
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

--- a/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+++ b/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team


 All rights reserved.
@ -51,7 +51,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "FBXUtil.h"
 #include <assimp/defs.h>
 #include <stdint.h>
-#include <cstdint>
 #include <assimp/Exceptional.h>
 #include <assimp/ByteSwapper.h>
 #include <assimp/DefaultLogger.hpp>
@ -140,7 +139,6 @@ size_t Offset(const char* begin, const char* cursor) {
 }

 // ------------------------------------------------------------------------------------------------
-AI_WONT_RETURN void TokenizeError(const std::string& message, const char* begin, const char* cursor) AI_WONT_RETURN_SUFFIX;
 void TokenizeError(const std::string& message, const char* begin, const char* cursor) {
    TokenizeError(message, Offset(begin, cursor));
 }
@ -343,7 +341,8 @@ void ReadData(const char*& sbegin_out, const char*& send_out, const char* input,


 // ------------------------------------------------------------------------------------------------
-bool ReadScope(TokenList &output_tokens, StackAllocator &token_allocator, const char *input, const char *&cursor, const char *end, bool const is64bits) {
+bool ReadScope(TokenList& output_tokens, const char* input, const char*& cursor, const char* end, bool const is64bits)
+{
    // the first word contains the offset at which this block ends
 	const uint64_t end_offset = is64bits ? ReadDoubleWord(input, cursor, end) : ReadWord(input, cursor, end);

@ -409,7 +408,7 @@ bool ReadScope(TokenList &output_tokens, StackAllocator &token_allocator, const

        // XXX this is vulnerable to stack overflowing ..
        while(Offset(input, cursor) < end_offset - sentinel_block_length) {
-            ReadScope(output_tokens, token_allocator, input, cursor, input + end_offset - sentinel_block_length, is64bits);
+			ReadScope(output_tokens, input, cursor, input + end_offset - sentinel_block_length, is64bits);
        }
        output_tokens.push_back(new_Token(cursor, cursor + 1, TokenType_CLOSE_BRACKET, Offset(input, cursor) ));

@ -432,7 +431,8 @@ bool ReadScope(TokenList &output_tokens, StackAllocator &token_allocator, const

 // ------------------------------------------------------------------------------------------------
 // TODO: Test FBX Binary files newer than the 7500 version to check if the 64 bits address behaviour is consistent
-void TokenizeBinary(TokenList &output_tokens, const char *input, size_t length, StackAllocator &token_allocator) {
+void TokenizeBinary(TokenList& output_tokens, const char* input, size_t length)
+{
 	ai_assert(input);
 	ASSIMP_LOG_DEBUG("Tokenizing binary FBX file");

@ -465,14 +465,14 @@ void TokenizeBinary(TokenList &output_tokens, const char *input, size_t length,
    try
    {
        while (cursor < end ) {
-            if (!ReadScope(output_tokens, token_allocator, input, cursor, input + length, is64bits)) {
+		    if (!ReadScope(output_tokens, input, cursor, input + length, is64bits)) {
                break;
            }
        }
    }
    catch (const DeadlyImportError& e)
    {
-        if (!is64bits && (length > std::numeric_limits<uint32_t>::max())) {
+        if (!is64bits && (length > std::numeric_limits<std::uint32_t>::max())) {
            throw DeadlyImportError("The FBX file is invalid. This may be because the content is too big for this older version (", ai_to_string(version), ") of the FBX format. (", e.what(), ")");
        }
        throw;
--- a/code/AssetLib/FBX/FBXCommon.h
+++ b/code/AssetLib/FBX/FBXCommon.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -55,7 +55,6 @@ const char NULL_RECORD[NumNullRecords] = { // 25 null bytes in 64-bit and 13 nul
    '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',
    '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0'
 }; // who knows why, it looks like two integers 32/64 bit (compressed and uncompressed sizes?) + 1 byte (might be compression type?)
-static std::string NULL_RECORD_STRING(NumNullRecords, '\0');
 const std::string SEPARATOR = { '\x00', '\x01' }; // for use inside strings
 const std::string MAGIC_NODE_TAG = "_$AssimpFbx$"; // from import
 const int64_t SECOND = 46186158000; // FBX's kTime unit
--- a/code/AssetLib/FBX/FBXCompileConfig.h
+++ b/code/AssetLib/FBX/FBXCompileConfig.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

--- a/code/AssetLib/FBX/FBXConverter.cpp
+++ b/code/AssetLib/FBX/FBXConverter.cpp
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -55,7 +55,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #include <assimp/MathFunctions.h>
 #include <assimp/StringComparison.h>
+
 #include <assimp/scene.h>
+
 #include <assimp/CreateAnimMesh.h>
 #include <assimp/StringUtils.h>
 #include <assimp/commonMetaData.h>
@ -76,53 +78,6 @@ using namespace Util;

 #define CONVERT_FBX_TIME(time) static_cast<double>(time) / 46186158000LL

-static void correctRootTransform(const aiScene *scene) {
-    if (scene == nullptr) {
-        return;
-    }
-
-    if (scene->mMetaData == nullptr) {
-        return;
-    }
-
-    int32_t UpAxis = 1, UpAxisSign = 1, FrontAxis = 2, FrontAxisSign = 1, CoordAxis = 0, CoordAxisSign = 1;
-    double UnitScaleFactor = 1.0;
-    for (unsigned MetadataIndex = 0; MetadataIndex < scene->mMetaData->mNumProperties; ++MetadataIndex) {
-        if (strcmp(scene->mMetaData->mKeys[MetadataIndex].C_Str(), "UpAxis") == 0) {
-            scene->mMetaData->Get<int32_t>(MetadataIndex, UpAxis);
-        }
-        if (strcmp(scene->mMetaData->mKeys[MetadataIndex].C_Str(), "UpAxisSign") == 0) {
-            scene->mMetaData->Get<int32_t>(MetadataIndex, UpAxisSign);
-        }
-        if (strcmp(scene->mMetaData->mKeys[MetadataIndex].C_Str(), "FrontAxis") == 0) {
-            scene->mMetaData->Get<int32_t>(MetadataIndex, FrontAxis);
-        }
-        if (strcmp(scene->mMetaData->mKeys[MetadataIndex].C_Str(), "FrontAxisSign") == 0) {
-            scene->mMetaData->Get<int32_t>(MetadataIndex, FrontAxisSign);
-        }
-        if (strcmp(scene->mMetaData->mKeys[MetadataIndex].C_Str(), "CoordAxis") == 0) {
-            scene->mMetaData->Get<int32_t>(MetadataIndex, CoordAxis);
-        }
-        if (strcmp(scene->mMetaData->mKeys[MetadataIndex].C_Str(), "CoordAxisSign") == 0) {
-            scene->mMetaData->Get<int32_t>(MetadataIndex, CoordAxisSign);
-        }
-        if (strcmp(scene->mMetaData->mKeys[MetadataIndex].C_Str(), "UnitScaleFactor") == 0) {
-            scene->mMetaData->Get<double>(MetadataIndex, UnitScaleFactor);
-        }
-    }
-
-    aiVector3D upVec, forwardVec, rightVec;
-    upVec[UpAxis] = UpAxisSign * static_cast<float>(UnitScaleFactor);
-    forwardVec[FrontAxis] = FrontAxisSign * static_cast<float>(UnitScaleFactor);
-    rightVec[CoordAxis] = CoordAxisSign * (float)UnitScaleFactor;
-
-    aiMatrix4x4 mat(rightVec.x, rightVec.y, rightVec.z, 0.0f,
-                    upVec.x, upVec.y, upVec.z, 0.0f,
-                    forwardVec.x, forwardVec.y, forwardVec.z, 0.0f,
-                    0.0f, 0.0f, 0.0f, 1.0f);
-    scene->mRootNode->mTransformation *= mat;
-}
-
 FBXConverter::FBXConverter(aiScene *out, const Document &doc, bool removeEmptyBones) :
        defaultMaterialIndex(),
        mMeshes(),
@ -138,8 +93,6 @@ FBXConverter::FBXConverter(aiScene *out, const Document &doc, bool removeEmptyBo
        mSceneOut(out),
        doc(doc),
        mRemoveEmptyBones(removeEmptyBones) {
-
-
    // animations need to be converted first since this will
    // populate the node_anim_chain_bits map, which is needed
    // to determine which nodes need to be generated.
@ -166,7 +119,7 @@ FBXConverter::FBXConverter(aiScene *out, const Document &doc, bool removeEmptyBo
            if (mat) {

                if (materials_converted.find(mat) == materials_converted.end()) {
-                    ConvertMaterial(*mat, nullptr);
+                    ConvertMaterial(*mat, 0);
                }
            }
        }
@ -180,10 +133,6 @@ FBXConverter::FBXConverter(aiScene *out, const Document &doc, bool removeEmptyBo
    // need not contain geometry (i.e. camera animations, raw armatures).
    if (out->mNumMeshes == 0) {
        out->mFlags |= AI_SCENE_FLAGS_INCOMPLETE;
-    } else {
-        // Apply the FBX axis metadata unless requested not to
-        if (!doc.Settings().ignoreUpDirection)
-            correctRootTransform(mSceneOut);
    }
 }

@ -293,7 +242,7 @@ void FBXConverter::ConvertNodes(uint64_t id, aiNode *parent, aiNode *root_node)
            ai_assert(nodes_chain.size());

            if (need_additional_node) {
-                nodes_chain.emplace_back(node_name);
+                nodes_chain.emplace_back(PotentialNode(node_name));
            }

            //setup metadata on newest node
@ -312,8 +261,6 @@ void FBXConverter::ConvertNodes(uint64_t id, aiNode *parent, aiNode *root_node)

                child->mParent = last_parent;
                last_parent = child.mNode;
-
-                new_abs_transform *= child->mTransformation;
            }

            // attach geometry
@ -336,8 +283,6 @@ void FBXConverter::ConvertNodes(uint64_t id, aiNode *parent, aiNode *root_node)

                    postnode->mParent = last_parent;
                    last_parent = postnode.mNode;
-
-                    new_abs_transform *= postnode->mTransformation;
                }
            } else {
                // free the nodes we allocated as we don't need them
@ -360,15 +305,18 @@ void FBXConverter::ConvertNodes(uint64_t id, aiNode *parent, aiNode *root_node)
        }
    }

-    if (nodes.empty()) {
-        parent->mNumChildren = 0;
-        parent->mChildren = nullptr;
-    } else {
+    if (nodes.size()) {
        parent->mChildren = new aiNode *[nodes.size()]();
        parent->mNumChildren = static_cast<unsigned int>(nodes.size());
-        for (unsigned int i = 0; i < nodes.size(); ++i) {
+
+        for (unsigned int i = 0; i < nodes.size(); ++i)
+        {
            parent->mChildren[i] = nodes[i].mOwnership.release();
        }
+        nodes.clear();
+    } else {
+        parent->mNumChildren = 0;
+        parent->mChildren = nullptr;
    }
 }

@ -476,32 +424,16 @@ void FBXConverter::ConvertCamera(const Camera &cam, const std::string &orig_name

    out_camera->mAspect = cam.AspectWidth() / cam.AspectHeight();

-    // NOTE: Camera mPosition, mLookAt and mUp must be set to default here.
-    // All transformations to the camera will be handled by its node in the scenegraph.
    out_camera->mPosition = aiVector3D(0.0f);
    out_camera->mLookAt = aiVector3D(1.0f, 0.0f, 0.0f);
    out_camera->mUp = aiVector3D(0.0f, 1.0f, 0.0f);

-    // NOTE: Some software (maya) does not put FieldOfView in FBX, so we compute
-    // mHorizontalFOV from FocalLength and FilmWidth with unit conversion.
+    out_camera->mHorizontalFOV = AI_DEG_TO_RAD(cam.FieldOfView());

-    // TODO: This is not a complete solution for how FBX cameras can be stored.
-    // TODO: Incorporate non-square pixel aspect ratio.
-    // TODO: FBX aperture mode might be storing vertical FOV in need of conversion with aspect ratio.
-
-    float fov_deg = cam.FieldOfView();
-    // If FOV not specified in file, compute using FilmWidth and FocalLength.
-    if (fov_deg == kFovUnknown) {
-        float film_width_inches = cam.FilmWidth();
-        float focal_length_mm = cam.FocalLength();
-        ASSIMP_LOG_VERBOSE_DEBUG("FBX FOV unspecified. Computing from FilmWidth (", film_width_inches, "inches) and FocalLength (", focal_length_mm, "mm).");
-        double half_fov_rad = std::atan2(film_width_inches * 25.4 * 0.5, focal_length_mm);
-        out_camera->mHorizontalFOV = static_cast<float>(half_fov_rad);
-    } else {
-        // FBX fov is full-view degrees. We want half-view radians.
-        out_camera->mHorizontalFOV = AI_DEG_TO_RAD(fov_deg) * 0.5f;
-    }
+    out_camera->mClipPlaneNear = cam.NearPlane();
+    out_camera->mClipPlaneFar = cam.FarPlane();

+    out_camera->mHorizontalFOV = AI_DEG_TO_RAD(cam.FieldOfView());
    out_camera->mClipPlaneNear = cam.NearPlane();
    out_camera->mClipPlaneFar = cam.FarPlane();
 }
@ -630,17 +562,16 @@ void FBXConverter::GetRotationMatrix(Model::RotOrder mode, const aiVector3D &rot
    bool is_id[3] = { true, true, true };

    aiMatrix4x4 temp[3];
-    const auto rot = AI_DEG_TO_RAD(rotation);
-    if (std::fabs(rot.z) > angle_epsilon) {
-        aiMatrix4x4::RotationZ(rot.z, temp[2]);
+    if (std::fabs(rotation.z) > angle_epsilon) {
+        aiMatrix4x4::RotationZ(AI_DEG_TO_RAD(rotation.z), temp[2]);
        is_id[2] = false;
    }
-    if (std::fabs(rot.y) > angle_epsilon) {
-        aiMatrix4x4::RotationY(rot.y, temp[1]);
+    if (std::fabs(rotation.y) > angle_epsilon) {
+        aiMatrix4x4::RotationY(AI_DEG_TO_RAD(rotation.y), temp[1]);
        is_id[1] = false;
    }
-    if (std::fabs(rot.x) > angle_epsilon) {
-        aiMatrix4x4::RotationX(rot.x, temp[0]);
+    if (std::fabs(rotation.x) > angle_epsilon) {
+        aiMatrix4x4::RotationX(AI_DEG_TO_RAD(rotation.x), temp[0]);
        is_id[0] = false;
    }

@ -712,7 +643,7 @@ void FBXConverter::GetRotationMatrix(Model::RotOrder mode, const aiVector3D &rot
 bool FBXConverter::NeedsComplexTransformationChain(const Model &model) {
    const PropertyTable &props = model.Props();

-    const auto zero_epsilon = Math::getEpsilon<ai_real>();
+    const auto zero_epsilon = ai_epsilon;
    const aiVector3D all_ones(1.0f, 1.0f, 1.0f);
    for (size_t i = 0; i < TransformationComp_MAXIMUM; ++i) {
        const TransformationComp comp = static_cast<TransformationComp>(i);
@ -945,12 +876,8 @@ void FBXConverter::SetupNodeMetadata(const Model &model, aiNode &nd) {
            data->Set(index++, prop.first, interpretedBool->Value());
        } else if (const TypedProperty<int> *interpretedInt = prop.second->As<TypedProperty<int>>()) {
            data->Set(index++, prop.first, interpretedInt->Value());
-        } else if (const TypedProperty<uint32_t> *interpretedUInt = prop.second->As<TypedProperty<uint32_t>>()) {
-            data->Set(index++, prop.first, interpretedUInt->Value());
        } else if (const TypedProperty<uint64_t> *interpretedUint64 = prop.second->As<TypedProperty<uint64_t>>()) {
            data->Set(index++, prop.first, interpretedUint64->Value());
-        } else if (const TypedProperty<int64_t> *interpretedint64 = prop.second->As<TypedProperty<int64_t>>()) {
-            data->Set(index++, prop.first, interpretedint64->Value());
        } else if (const TypedProperty<float> *interpretedFloat = prop.second->As<TypedProperty<float>>()) {
            data->Set(index++, prop.first, interpretedFloat->Value());
        } else if (const TypedProperty<std::string> *interpretedString = prop.second->As<TypedProperty<std::string>>()) {
@ -1252,23 +1179,15 @@ unsigned int FBXConverter::ConvertMeshSingleMaterial(const MeshGeometry &mesh, c
    std::vector<aiAnimMesh *> animMeshes;
    for (const BlendShape *blendShape : mesh.GetBlendShapes()) {
        for (const BlendShapeChannel *blendShapeChannel : blendShape->BlendShapeChannels()) {
-            const auto& shapeGeometries = blendShapeChannel->GetShapeGeometries();
-            for (const ShapeGeometry *shapeGeometry : shapeGeometries) {
+            const std::vector<const ShapeGeometry *> &shapeGeometries = blendShapeChannel->GetShapeGeometries();
+            for (size_t i = 0; i < shapeGeometries.size(); i++) {
                aiAnimMesh *animMesh = aiCreateAnimMesh(out_mesh);
-                const auto &curVertices = shapeGeometry->GetVertices();
-                const auto &curNormals = shapeGeometry->GetNormals();
-                const auto &curIndices = shapeGeometry->GetIndices();
+                const ShapeGeometry *shapeGeometry = shapeGeometries.at(i);
+                const std::vector<aiVector3D> &curVertices = shapeGeometry->GetVertices();
+                const std::vector<aiVector3D> &curNormals = shapeGeometry->GetNormals();
+                const std::vector<unsigned int> &curIndices = shapeGeometry->GetIndices();
                //losing channel name if using shapeGeometry->Name()
-                // if blendShapeChannel Name is empty or doesn't have a ".", add geoMetryName;
-                auto aniName = FixAnimMeshName(blendShapeChannel->Name());
-                auto geoMetryName = FixAnimMeshName(shapeGeometry->Name());
-                if (aniName.empty()) {
-                    aniName = geoMetryName;
-                }
-                else if (aniName.find('.') == aniName.npos) {
-                    aniName += "." + geoMetryName;
-                }
-                animMesh->mName.Set(aniName);
+                animMesh->mName.Set(FixAnimMeshName(blendShapeChannel->Name()));
                for (size_t j = 0; j < curIndices.size(); j++) {
                    const unsigned int curIndex = curIndices.at(j);
                    aiVector3D vertex = curVertices.at(j);
@ -1490,12 +1409,13 @@ unsigned int FBXConverter::ConvertMeshMultiMaterial(const MeshGeometry &mesh, co
    std::vector<aiAnimMesh *> animMeshes;
    for (const BlendShape *blendShape : mesh.GetBlendShapes()) {
        for (const BlendShapeChannel *blendShapeChannel : blendShape->BlendShapeChannels()) {
-            const auto& shapeGeometries = blendShapeChannel->GetShapeGeometries();
-            for (const ShapeGeometry *shapeGeometry : shapeGeometries) {
+            const std::vector<const ShapeGeometry *> &shapeGeometries = blendShapeChannel->GetShapeGeometries();
+            for (size_t i = 0; i < shapeGeometries.size(); i++) {
                aiAnimMesh *animMesh = aiCreateAnimMesh(out_mesh);
-                const auto& curVertices = shapeGeometry->GetVertices();
-                const auto& curNormals = shapeGeometry->GetNormals();
-                const auto& curIndices = shapeGeometry->GetIndices();
+                const ShapeGeometry *shapeGeometry = shapeGeometries.at(i);
+                const std::vector<aiVector3D> &curVertices = shapeGeometry->GetVertices();
+                const std::vector<aiVector3D> &curNormals = shapeGeometry->GetNormals();
+                const std::vector<unsigned int> &curIndices = shapeGeometry->GetIndices();
                animMesh->mName.Set(FixAnimMeshName(shapeGeometry->Name()));
                for (size_t j = 0; j < curIndices.size(); j++) {
                    unsigned int curIndex = curIndices.at(j);
@ -1538,9 +1458,7 @@ static void copyBoneToSkeletonBone(aiMesh *mesh, aiBone *bone, aiSkeletonBone *s
    skeletonBone->mWeights = bone->mWeights;
    skeletonBone->mOffsetMatrix = bone->mOffsetMatrix;
    skeletonBone->mMeshId = mesh;
-#ifndef ASSIMP_BUILD_NO_ARMATUREPOPULATE_PROCESS
    skeletonBone->mNode = bone->mNode;
-#endif
    skeletonBone->mParent = -1;
 }

@ -1648,7 +1566,7 @@ void FBXConverter::ConvertWeights(aiMesh *out, const MeshGeometry &geo, const ai
        out->mBones = nullptr;
        out->mNumBones = 0;
        return;
-    }
+    } 

    out->mBones = new aiBone *[bones.size()]();
    out->mNumBones = static_cast<unsigned int>(bones.size());
@ -1657,7 +1575,7 @@ void FBXConverter::ConvertWeights(aiMesh *out, const MeshGeometry &geo, const ai

 void FBXConverter::ConvertCluster(std::vector<aiBone*> &local_mesh_bones, const Cluster *cluster,
        std::vector<size_t> &out_indices, std::vector<size_t> &index_out_indices,
-        std::vector<size_t> &count_out_indices, const aiMatrix4x4 &absolute_transform,
+        std::vector<size_t> &count_out_indices, const aiMatrix4x4 & /* absolute_transform*/,
        aiNode *) {
    ai_assert(cluster != nullptr); // make sure cluster valid

@ -1674,16 +1592,16 @@ void FBXConverter::ConvertCluster(std::vector<aiBone*> &local_mesh_bones, const
        bone = new aiBone();
        bone->mName = bone_name;

-        //bone->mOffsetMatrix = cluster->Transform();
+        bone->mOffsetMatrix = cluster->Transform();
        // store local transform link for post processing
-        
+        /*
        bone->mOffsetMatrix = cluster->TransformLink();
        bone->mOffsetMatrix.Inverse();

-        const aiMatrix4x4 matrix = (aiMatrix4x4)absolute_transform;
+        aiMatrix4x4 matrix = (aiMatrix4x4)absolute_transform;

        bone->mOffsetMatrix = bone->mOffsetMatrix * matrix; // * mesh_offset
-        
+        */
        //
        // Now calculate the aiVertexWeights
        //
@ -1866,7 +1784,7 @@ aiString FBXConverter::GetTexturePath(const Texture *tex) {
                // We need to load all textures before referencing them, as FBX file format order may reference a texture before loading it
                // This may occur on this case too, it has to be studied
                path.data[0] = '*';
-                path.length = 1 + ASSIMP_itoa10(path.data + 1, AI_MAXLEN - 1, index);
+                path.length = 1 + ASSIMP_itoa10(path.data + 1, MAXLEN - 1, index);
            }
        }
    }
@ -2134,10 +2052,6 @@ void FBXConverter::SetTextureProperties(aiMaterial *out_mat, const TextureMap &_
    TrySetTextureProperties(out_mat, _textures, "Maya|emissionColor", aiTextureType_EMISSION_COLOR, mesh);
    TrySetTextureProperties(out_mat, _textures, "Maya|metalness", aiTextureType_METALNESS, mesh);
    TrySetTextureProperties(out_mat, _textures, "Maya|diffuseRoughness", aiTextureType_DIFFUSE_ROUGHNESS, mesh);
-    TrySetTextureProperties(out_mat, _textures, "Maya|base", aiTextureType_MAYA_BASE, mesh);
-    TrySetTextureProperties(out_mat, _textures, "Maya|specular", aiTextureType_MAYA_SPECULAR, mesh);
-    TrySetTextureProperties(out_mat, _textures, "Maya|specularColor", aiTextureType_MAYA_SPECULAR_COLOR, mesh);
-    TrySetTextureProperties(out_mat, _textures, "Maya|specularRoughness", aiTextureType_MAYA_SPECULAR_ROUGHNESS, mesh);

    // Maya stingray
    TrySetTextureProperties(out_mat, _textures, "Maya|TEX_color_map", aiTextureType_BASE_COLOR, mesh);
@ -2450,7 +2364,7 @@ void FBXConverter::SetShadingPropertiesRaw(aiMaterial *out_mat, const PropertyTa

                // setup texture reference string (copied from ColladaLoader::FindFilenameForEffectTexture)
                path.data[0] = '*';
-                path.length = 1 + ASSIMP_itoa10(path.data + 1, AI_MAXLEN - 1, index);
+                path.length = 1 + ASSIMP_itoa10(path.data + 1, MAXLEN - 1, index);
            }

            out_mat->AddProperty(&path, (name + "|file").c_str(), aiTextureType_UNKNOWN, 0);
@ -2816,7 +2730,7 @@ void FBXConverter::ProcessMorphAnimDatas(std::map<std::string, morphAnimData *>
                                auto geoIt = std::find(model->GetGeometry().begin(), model->GetGeometry().end(), geo);
                                auto geoIndex = static_cast<unsigned int>(std::distance(model->GetGeometry().begin(), geoIt));
                                auto name = aiString(FixNodeName(model->Name() + "*"));
-                                name.length = 1 + ASSIMP_itoa10(name.data + name.length, AI_MAXLEN - 1, geoIndex);
+                                name.length = 1 + ASSIMP_itoa10(name.data + name.length, MAXLEN - 1, geoIndex);
                                morphAnimData *animData;
                                auto animIt = morphAnimDatas->find(name.C_Str());
                                if (animIt == morphAnimDatas->end()) {
@ -3283,6 +3197,7 @@ aiNodeAnim* FBXConverter::GenerateSimpleNodeAnim(const std::string& name,
    aiVector3D defTranslate = PropertyGet(props, "Lcl Translation", aiVector3D(0.f, 0.f, 0.f));
    aiVector3D defRotation = PropertyGet(props, "Lcl Rotation", aiVector3D(0.f, 0.f, 0.f));
    aiVector3D defScale = PropertyGet(props, "Lcl Scaling", aiVector3D(1.f, 1.f, 1.f));
+    aiQuaternion defQuat = EulerToQuaternion(defRotation, rotOrder);

    aiVectorKey* outTranslations = new aiVectorKey[keyCount];
    aiQuatKey* outRotations = new aiQuatKey[keyCount];
@ -3300,7 +3215,6 @@ aiNodeAnim* FBXConverter::GenerateSimpleNodeAnim(const std::string& name,
    if (keyframeLists[TransformationComp_Rotation].size() > 0) {
        InterpolateKeys(outRotations, keytimes, keyframeLists[TransformationComp_Rotation], defRotation, maxTime, minTime, rotOrder);
    } else {
-        aiQuaternion defQuat = EulerToQuaternion(defRotation, rotOrder);
        for (size_t i = 0; i < keyCount; ++i) {
            outRotations[i].mTime = CONVERT_FBX_TIME(keytimes[i]) * anim_fps;
            outRotations[i].mValue = defQuat;
@ -3317,7 +3231,7 @@ aiNodeAnim* FBXConverter::GenerateSimpleNodeAnim(const std::string& name,
    }

    bool ok = false;
-
+    
    const auto zero_epsilon = ai_epsilon;

    const aiVector3D& preRotation = PropertyGet<aiVector3D>(props, "PreRotation", ok);
@ -3405,7 +3319,7 @@ FBXConverter::KeyFrameListList FBXConverter::GetKeyframeList(const std::vector<c
                }
            }

-            inputs.emplace_back(Keys, Values, mapto);
+            inputs.push_back(std::make_tuple(Keys, Values, mapto));
        }
    }
    return inputs; // pray for NRVO :-)
@ -3482,7 +3396,7 @@ FBXConverter::KeyFrameListList FBXConverter::GetRotationKeyframeList(const std::
                    }
                }
            }
-            inputs.emplace_back(Keys, Values, mapto);
+            inputs.push_back(std::make_tuple(Keys, Values, mapto));
        }
    }
    return inputs;
--- a/code/AssetLib/FBX/FBXConverter.h
+++ b/code/AssetLib/FBX/FBXConverter.h
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team


 All rights reserved.
--- a/code/AssetLib/FBX/FBXDeformer.cpp
+++ b/code/AssetLib/FBX/FBXDeformer.cpp
@ -2,7 +2,7 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

-Copyright (c) 2006-2024, assimp team
+Copyright (c) 2006-2022, assimp team

 All rights reserved.

@ -66,7 +66,11 @@ Deformer::Deformer(uint64_t id, const Element& element, const Document& doc, con
 }

 // ------------------------------------------------------------------------------------------------
-Deformer::~Deformer() = default;
+Deformer::~Deformer()
+{
+
+}
+

 // ------------------------------------------------------------------------------------------------
 Cluster::Cluster(uint64_t id, const Element& element, const Document& doc, const std::string& name)
@ -84,7 +88,7 @@ Cluster::Cluster(uint64_t id, const Element& element, const Document& doc, const
    transform = ReadMatrix(Transform);
    transformLink = ReadMatrix(TransformLink);

-    // it is actually possible that there are Deformer's with no weights
+    // it is actually possible that there be Deformer's with no weights
    if (!!Indexes != !!Weights) {
        DOMError("either Indexes or Weights are missing from Cluster",&element);
    }
@ -115,7 +119,11 @@ Cluster::Cluster(uint64_t id, const Element& element, const Document& doc, const


 // ------------------------------------------------------------------------------------------------
-Cluster::~Cluster() = default;
+Cluster::~Cluster()
+{
+
+}
+

 // ------------------------------------------------------------------------------------------------
 Skin::Skin(uint64_t id, const Element& element, const Document& doc, const std::string& name)
@ -144,7 +152,10 @@ Skin::Skin(uint64_t id, const Element& element, const Document& doc, const std::


 // ------------------------------------------------------------------------------------------------
-Skin::~Skin() = default;
+Skin::~Skin()
+{
+
+}
 // ------------------------------------------------------------------------------------------------
 BlendShape::BlendShape(uint64_t id, const Element& element, const Document& doc, const std::string& name)
    : Deformer(id, element, doc, name)
@ -154,15 +165,16 @@ BlendShape::BlendShape(uint64_t id, const Element& element, const Document& doc,
    for (const Connection* con : conns) {
        const BlendShapeChannel* const bspc = ProcessSimpleConnection<BlendShapeChannel>(*con, false, "BlendShapeChannel -> BlendShape", element);
        if (bspc) {
-            auto pr = blendShapeChannels.insert(bspc);
-            if (!pr.second) {
-                FBXImporter::LogWarn("there is the same blendShapeChannel id ", bspc->ID());
-            }
+            blendShapeChannels.push_back(bspc);
+            continue;
        }
    }
 }
 // ------------------------------------------------------------------------------------------------
-BlendShape::~BlendShape() = default;
+BlendShape::~BlendShape()
+{
+
+}
 // ------------------------------------------------------------------------------------------------
 BlendShapeChannel::BlendShapeChannel(uint64_t id, const Element& element, const Document& doc, const std::string& name)
    : Deformer(id, element, doc, name)
@ -181,15 +193,16 @@ BlendShapeChannel::BlendShapeChannel(uint64_t id, const Element& element, const
    for (const Connection* con : conns) {
        const ShapeGeometry* const sg = ProcessSimpleConnection<ShapeGeometry>(*con, false, "Shape -> BlendShapeChannel", element);
        if (sg) {
-            auto pr = shapeGeometries.insert(sg);
-            if (!pr.second) {
-                FBXImporter::LogWarn("there is the same shapeGeometrie id ", sg->ID());
-            }
+            shapeGeometries.push_back(sg);
+            continue;
        }
    }
 }
 // ------------------------------------------------------------------------------------------------
-BlendShapeChannel::~BlendShapeChannel() = default;
+BlendShapeChannel::~BlendShapeChannel()
+{
+
+}
 // ------------------------------------------------------------------------------------------------
 }
 }
--- a/Show More
+++ b/Show More