[Bf-extensions-cvs] [5f579088] master: Fix T67673: Import .obj with more than one unnamed object fails.
Bastien Montagne
noreply at git.blender.org
Fri Jul 26 11:59:39 CEST 2019
Commit: 5f579088bba5bf9869651c6f622fd85bbf59edc7
Author: Bastien Montagne
Date: Fri Jul 26 11:58:42 2019 +0200
Branches: master
https://developer.blender.org/rBA5f579088bba5bf9869651c6f622fd85bbf59edc7
Fix T67673: Import .obj with more than one unnamed object fails.
===================================================================
M io_scene_obj/__init__.py
M io_scene_obj/import_obj.py
===================================================================
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)
More information about the Bf-extensions-cvs
mailing list