v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

pull/1681/head
Kim Kulling 2018-01-06 18:06:26 +01:00 committed by GitHub
parent ca152f41e2 e0e1b17881
commit 527a5ea5f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -60,6 +60,7 @@ test/gtest/src/gtest-stamp/Debug/gtest-build
*.lib *.lib
test/gtest/src/gtest-stamp/Debug/ test/gtest/src/gtest-stamp/Debug/
tools/assimp_view/assimp_viewer.vcxproj.user tools/assimp_view/assimp_viewer.vcxproj.user
*.pyc
# Unix editor backups # Unix editor backups
*~ *~

5
port/PyAssimp/pyassimp/helper.py
View File

@ -51,11 +51,8 @@ if os.name=='posix':
elif os.name=='nt': elif os.name=='nt':
ext_whitelist.append('.dll') ext_whitelist.append('.dll')
path_dirs = os.environ['PATH'].split(';') path_dirs = os.environ['PATH'].split(';')
for dir_candidate in path_dirs: additional_dirs.extend(path_dirs)
if 'assimp' in dir_candidate.lower():
additional_dirs.append(dir_candidate)
#print(additional_dirs)
def vec2tuple(x): def vec2tuple(x):
""" Converts a VECTOR3D to a Tuple """ """ Converts a VECTOR3D to a Tuple """
return (x.x, x.y, x.z) return (x.x, x.y, x.z)