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-06-03 12:58:25 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2019-06-03 12:58:25 +0300
commitd79fa2c042e34e1639030b06ff762673a0a68803 (patch)
tree5d48ee1703f6acd32de2dbdbdb340eb1aa4eb146 /io_scene_obj/import_obj.py
parentc5452a62178454d7e804ce711674dd0a400c2140 (diff)
Fix T65326: OBJ import is broken when no material is in OBJ file.
Caused by rB8252cc7044ea (fix for T65215), we actually need a default material in edges-only case too, not to exclude None (default) one in that case...
Diffstat (limited to 'io_scene_obj/import_obj.py')
-rw-r--r--io_scene_obj/import_obj.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/io_scene_obj/import_obj.py b/io_scene_obj/import_obj.py
index 09cf7efc..c565bd05 100644
--- a/io_scene_obj/import_obj.py
+++ b/io_scene_obj/import_obj.py
@@ -520,7 +520,7 @@ def split_mesh(verts_loc, faces, unique_materials, filepath, SPLIT_OB_OR_GROUP):
face_vert_loc_indices[loop_idx] = map_index # remap to the local index
- if context_material is not None and context_material not in unique_materials_split:
+ if context_material not in unique_materials_split:
unique_materials_split[context_material] = unique_materials[context_material]
faces_split.append(face)
@@ -1104,6 +1104,8 @@ def load(context,
# as a polyline, and not a regular face...
face[1][:] = [True]
faces.append(face)
+ if context_material is None:
+ use_default_material = True
# Else, use face_vert_loc_indices previously defined and used the obj_face
context_multi_line = b'l' if strip_slash(line_split) else b''