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>2016-03-19 19:23:28 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-04-05 11:54:35 +0300
commitd464ae7c75d5a69f3713796fe069a399ba225fd8 (patch)
treefefc631118a3780e53a8d6670517478513e239bc
parent3b7e75875b8c038aede22ebd8da8676d364f1d59 (diff)
Fix T47831: Obj_Import_Problem.
Actually, think that's not valid OBJ (using '0' index instead of nothing when not assigning data to some face corner). But since supporting this is easy...
-rw-r--r--io_scene_obj/__init__.py4
-rw-r--r--io_scene_obj/import_obj.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/io_scene_obj/__init__.py b/io_scene_obj/__init__.py
index aff0b345..daeed232 100644
--- a/io_scene_obj/__init__.py
+++ b/io_scene_obj/__init__.py
@@ -21,8 +21,8 @@
bl_info = {
"name": "Wavefront OBJ format",
"author": "Campbell Barton, Bastien Montagne",
- "version": (2, 3, 0),
- "blender": (2, 76, 0),
+ "version": (2, 3, 1),
+ "blender": (2, 77, 0),
"location": "File > Import-Export",
"description": "Import-Export OBJ, Import OBJ mesh, UV's, materials and textures",
"warning": "",
diff --git a/io_scene_obj/import_obj.py b/io_scene_obj/import_obj.py
index 7b065824..2028a1ca 100644
--- a/io_scene_obj/import_obj.py
+++ b/io_scene_obj/import_obj.py
@@ -1015,14 +1015,14 @@ def load(context,
# formatting for faces with normals and textures is
# loc_index/tex_index/nor_index
- if len(obj_vert) > 1 and obj_vert[1]:
+ if len(obj_vert) > 1 and obj_vert[1] and obj_vert[1] != b'0':
idx = int(obj_vert[1]) - 1
face_vert_tex_indices.append((idx + len(verts_tex) + 1) if (idx < 0) else idx)
face_vert_tex_valid = True
else:
face_vert_tex_indices.append(...)
- if len(obj_vert) > 2 and obj_vert[2]:
+ if len(obj_vert) > 2 and obj_vert[2] and obj_vert[2] != b'0':
idx = int(obj_vert[2]) - 1
face_vert_nor_indices.append((idx + len(verts_nor) + 1) if (idx < 0) else idx)
face_vert_nor_valid = True