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
527a5ea5
Unverified
Commit
527a5ea5
authored
7 years ago
by
Kim Kulling
Committed by
GitHub
7 years ago
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into 1674-buffer-relative-uri
parents
ca152f41
e0e1b178
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitignore
+1
-0
1 addition, 0 deletions
.gitignore
port/PyAssimp/pyassimp/helper.py
+1
-4
1 addition, 4 deletions
port/PyAssimp/pyassimp/helper.py
with
2 additions
and
4 deletions
.gitignore
+
1
−
0
View file @
527a5ea5
...
...
@@ -60,6 +60,7 @@ test/gtest/src/gtest-stamp/Debug/gtest-build
*.lib
test/gtest/src/gtest-stamp/Debug/
tools/assimp_view/assimp_viewer.vcxproj.user
*.pyc
# Unix editor backups
*~
...
...
This diff is collapsed.
Click to expand it.
port/PyAssimp/pyassimp/helper.py
+
1
−
4
View file @
527a5ea5
...
...
@@ -51,11 +51,8 @@ if os.name=='posix':
elif
os
.
name
==
'
nt
'
:
ext_whitelist
.
append
(
'
.dll
'
)
path_dirs
=
os
.
environ
[
'
PATH
'
].
split
(
'
;
'
)
for
dir_candidate
in
path_dirs
:
if
'
assimp
'
in
dir_candidate
.
lower
():
additional_dirs
.
append
(
dir_candidate
)
additional_dirs
.
extend
(
path_dirs
)
#print(additional_dirs)
def
vec2tuple
(
x
):
"""
Converts a VECTOR3D to a Tuple
"""
return
(
x
.
x
,
x
.
y
,
x
.
z
)
...
...
This diff is collapsed.
Click to expand it.
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