diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-09-21 12:53:49 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-21 12:53:49 +0400 |
commit | e7917861175a3aed08ed00cd490df81f9a6fe56d (patch) | |
tree | 8074ce27e2b9a6d7684f73dfe250334671a41c02 | |
parent | 766d02e54568ac663f5fc6dff0d3ec9cf388f461 (diff) |
fix for image export on 3ds files, dont overwrite builtin 'map' for stl io
-rw-r--r-- | io_mesh_stl/stl_utils.py | 6 | ||||
-rw-r--r-- | io_scene_3ds/export_3ds.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/io_mesh_stl/stl_utils.py b/io_mesh_stl/stl_utils.py index e320774d..282409ab 100644 --- a/io_mesh_stl/stl_utils.py +++ b/io_mesh_stl/stl_utils.py @@ -49,9 +49,9 @@ def mmap_file(filename): with open(filename, 'rb') as file: # check http://bugs.python.org/issue8046 to have mmap context # manager fixed in python - map = mmap.mmap(file.fileno(), 0, access=mmap.ACCESS_READ) - yield map - map.close() + mem_map = mmap.mmap(file.fileno(), 0, access=mmap.ACCESS_READ) + yield mem_map + mem_map.close() class ListDict(dict): diff --git a/io_scene_3ds/export_3ds.py b/io_scene_3ds/export_3ds.py index fc8d7117..714d419a 100644 --- a/io_scene_3ds/export_3ds.py +++ b/io_scene_3ds/export_3ds.py @@ -446,7 +446,7 @@ def make_material_texture_chunk(id, images): """ mat_sub = _3ds_chunk(id) - def add_image(img): + def add_image(image): import bpy filename = bpy.path.basename(image.filepath) mat_sub_file = _3ds_chunk(MATMAPFILE) |