From e7917861175a3aed08ed00cd490df81f9a6fe56d Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 21 Sep 2011 08:53:49 +0000
Subject: [PATCH] fix for image export on 3ds files, dont overwrite builtin
'map' for stl io
---
io_mesh_stl/stl_utils.py | 6 +++---
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 e320774dc..282409abb 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 fc8d7117e..714d419af 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)
--
GitLab