Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
Qtquick3d Assimp
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Karlsson
Qtquick3d Assimp
Commits
bd29fe73
Commit
bd29fe73
authored
7 years ago
by
Kim Kulling
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into new_license_dates
parents
b049933d
9f304d36
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
code/3DSHelper.h
+17
-21
17 additions, 21 deletions
code/3DSHelper.h
code/3DSLoader.cpp
+3
-8
3 additions, 8 deletions
code/3DSLoader.cpp
code/ASEParser.cpp
+4
-4
4 additions, 4 deletions
code/ASEParser.cpp
code/ASEParser.h
+43
-42
43 additions, 42 deletions
code/ASEParser.h
with
67 additions
and
75 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
