浏览代码

Merge pull request #5164 from feuerste/py_read_from_memory

[pyassimp] Fix passing of file extension string.
Kim Kulling 2 年之前
父节点
当前提交
42386b829c
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      port/PyAssimp/pyassimp/core.py

+ 2 - 1
port/PyAssimp/pyassimp/core.py

@@ -311,6 +311,7 @@ def load(filename,
     Scene object with model data
     Scene object with model data
     '''
     '''
 
 
+    from ctypes import c_char_p
     if hasattr(filename, 'read'):
     if hasattr(filename, 'read'):
         # This is the case where a file object has been passed to load.
         # This is the case where a file object has been passed to load.
         # It is calling the following function:
         # It is calling the following function:
@@ -324,7 +325,7 @@ def load(filename,
         model = _assimp_lib.load_mem(data,
         model = _assimp_lib.load_mem(data,
                                      len(data),
                                      len(data),
                                      processing,
                                      processing,
-                                     file_type)
+                                     c_char_p(file_type.encode(sys.getfilesystemencoding())))
     else:
     else:
         # a filename string has been passed
         # a filename string has been passed
         model = _assimp_lib.load(filename.encode(sys.getfilesystemencoding()), processing)
         model = _assimp_lib.load(filename.encode(sys.getfilesystemencoding()), processing)