Skip to content
Snippets Groups Projects
Unverified Commit 527a5ea5 authored by Kim Kulling's avatar Kim Kulling Committed by GitHub
Browse files

Merge branch 'master' into 1674-buffer-relative-uri

parents ca152f41 e0e1b178
No related branches found
No related tags found
No related merge requests found
......@@ -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
*~
......
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment