Browse Source

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

Kim Kulling 7 years ago
parent
commit
527a5ea5f6
2 changed files with 2 additions and 4 deletions
  1. 1 0
      .gitignore
  2. 1 4
      port/PyAssimp/pyassimp/helper.py

+ 1 - 0
.gitignore

@@ -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
 *~
 *~

+ 1 - 4
port/PyAssimp/pyassimp/helper.py

@@ -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:
-        if 'assimp' in dir_candidate.lower():
-            additional_dirs.append(dir_candidate)
+    additional_dirs.extend(path_dirs)
 
 
-#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)