Merge branch 'master' into win_dll_so_version (9ebd74bd) · 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

9ebd74bd

Unverified Commit 9ebd74bd authored 3 years ago by Kim Kulling Committed by GitHub 3 years ago

Downloads
- Plain Diff

Merge branch 'master' into win_dll_so_version

parents 2ceb1874 9267f4c5

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

code/AssetLib/glTF2/glTF2Asset.h 2 additions, 1 deletion

code/AssetLib/glTF2/glTF2Asset.h
code/AssetLib/glTF2/glTF2Importer.cpp 1 addition, 0 deletions

code/AssetLib/glTF2/glTF2Importer.cpp
code/CMakeLists.txt 1 addition, 0 deletions

code/CMakeLists.txt
include/assimp/GltfMaterial.h 74 additions, 0 deletions

include/assimp/GltfMaterial.h
include/assimp/pbrmaterial.h 35 additions, 40 deletions

include/assimp/pbrmaterial.h
test/unit/utglTF2ImportExport.cpp 3 additions, 1 deletion

test/unit/utglTF2ImportExport.cpp

with 116 additions and 42 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