Merge pull request #4172 from assimp/kimkulling-diable_m3m_issue-4126 (4fa36481) · Commits · Jonas Karlsson / Qtquick3d Assimp · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Q

Qtquick3d Assimp
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents

Snippets Groups Projects

4fa36481

Unverified Commit 4fa36481 authored 3 years ago by Kim Kulling Committed by GitHub 3 years ago

Downloads
- Plain Diff

Merge pull request #4172 from assimp/kimkulling-diable_m3m_issue-4126

Disable m3d for 5.1

parents fe732134 f4873162

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 3 additions, 0 deletions

CMakeLists.txt
code/AssetLib/M3D/M3DExporter.cpp 2 additions, 2 deletions

code/AssetLib/M3D/M3DExporter.cpp
code/AssetLib/M3D/M3DExporter.h 4 additions, 5 deletions

code/AssetLib/M3D/M3DExporter.h
code/AssetLib/M3D/M3DWrapper.cpp 5 additions, 3 deletions

code/AssetLib/M3D/M3DWrapper.cpp
code/AssetLib/M3D/M3DWrapper.h 3 additions, 1 deletion

code/AssetLib/M3D/M3DWrapper.h
test/CMakeLists.txt 2 additions, 3 deletions

test/CMakeLists.txt
test/unit/ImportExport/utMD3Importer.cpp 1 addition, 0 deletions

test/unit/ImportExport/utMD3Importer.cpp

with 20 additions and 14 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment