blender
/
blender-addons
17
33
Fork 92
Code Issues 526 Pull Requests 32 Projects 1 Releases Wiki Activity

Fix T60387: Blender 2.8 OBJ file format not work in import mode. 

Bloody stupid mistake in 'speed-up parsing' work, yet annoyingly
difficult to spot on... :(
This commit is contained in:
Bastien Montagne 2019-01-11 11:48:17 +01:00
parent 5509187b4d
commit 46a9160c6f
Notes: blender-bot 2023-02-14 19:22:07 +01:00 
Referenced by issue #60387, Blender 2.8  OBJ file format not work in import mode
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
io_scene_obj/__init__.py
View File

@ -21,7 +21,7 @@
bl_info = {
"name": "Wavefront OBJ format",
"author": "Campbell Barton, Bastien Montagne",
"version": (3, 5, 4),
"version": (3, 5, 5),
"blender": (2, 80, 0),
"location": "File > Import-Export",
"description": "Import-Export OBJ, Import OBJ mesh, UV's, materials and textures",

7
io_scene_obj/import_obj.py
View File

@ -969,9 +969,9 @@ def load(context,
# and only fallback to full multi-line parsing when needed, this gives significant speed-up
# (~40% on affected code).
if line_start == b'v':
vdata, vdata_len, do_quick_vert = (verts_loc, 3, not skip_quick_vert)
vdata, vdata_len, do_quick_vert = verts_loc, 3, not skip_quick_vert
elif line_start == b'vn':
vdata, vdata_len, do_quick_vert = (verts_nor, 3, not skip_quick_vert)
vdata, vdata_len, do_quick_vert = verts_nor, 3, not skip_quick_vert
elif line_start == b'vt':
vdata, vdata_len, do_quick_vert = verts_tex, 2, not skip_quick_vert
elif context_multi_line == b'v':
@ -995,7 +995,8 @@ def load(context,
if quick_vert_failures > 10000:
skip_quick_vert = True
if not do_quick_vert:
context_multi_line = handle_vec(line_start, context_multi_line, line_split, b'v', vdata, vec, vdata_len)
context_multi_line = handle_vec(line_start, context_multi_line, line_split,
context_multi_line or line_start, vdata, vec, vdata_len)
elif line_start == b'f' or context_multi_line == b'f':
if not context_multi_line: