Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2019-07-26 12:58:42 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2019-07-26 12:58:42 +0300
commit5f579088bba5bf9869651c6f622fd85bbf59edc7 (patch)
tree02bacc90057de5f323b8a84ae382b0d45af08315 /io_scene_obj
parentfb464b014eb289a2477f7385b3a3be663eaf811d (diff)
Fix T67673: Import .obj with more than one unnamed object fails.
Diffstat (limited to 'io_scene_obj')
-rw-r--r--io_scene_obj/__init__.py2
-rw-r--r--io_scene_obj/import_obj.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/io_scene_obj/__init__.py b/io_scene_obj/__init__.py
index fdcb3021..611c95c4 100644
--- a/io_scene_obj/__init__.py
+++ b/io_scene_obj/__init__.py
@@ -21,7 +21,7 @@
bl_info = {
"name": "Wavefront OBJ format",
"author": "Campbell Barton, Bastien Montagne",
- "version": (3, 5, 10),
+ "version": (3, 5, 11),
"blender": (2, 80, 0),
"location": "File > Import-Export",
"description": "Import-Export OBJ, Import OBJ mesh, UV's, materials and textures",
diff --git a/io_scene_obj/import_obj.py b/io_scene_obj/import_obj.py
index 78d80872..f03ed2f1 100644
--- a/io_scene_obj/import_obj.py
+++ b/io_scene_obj/import_obj.py
@@ -915,6 +915,8 @@ def load(context,
"""
def unique_name(existing_names, name_orig):
i = 0
+ if name_orig is None:
+ name_orig = b"ObjObject"
name = name_orig
while name in existing_names:
name = b"%s.%03d" % (name_orig, i)