diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-07-14 16:41:39 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-07-14 16:41:39 +0300 |
| commit | 6e8234a541d477e560dea1cd3ab07a73bd3b8813 (patch) | |
| tree | 1883553ebf6b978379a85a5d2e7dacf2915b53d1 /io_scene_obj | |
| parent | f9e45007a9696ebd2827028bb16fe34301784ae7 (diff) | |
Fix T52054: Regression: Wavefront OBJ Import Fails With Current Builds.
Diffstat (limited to 'io_scene_obj')
| -rw-r--r-- | io_scene_obj/__init__.py | 2 | ||||
| -rw-r--r-- | io_scene_obj/import_obj.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/io_scene_obj/__init__.py b/io_scene_obj/__init__.py index 7712747c..d15a6cc7 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": (2, 3, 5), + "version": (2, 3, 6), "blender": (2, 78, 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 eb314c01..c3390d4d 100644 --- a/io_scene_obj/import_obj.py +++ b/io_scene_obj/import_obj.py @@ -359,7 +359,7 @@ def create_materials(filepath, relpath, context_material_name = line_value(line_split) context_material = unique_materials.get(context_material_name) - if use_cycles: + if use_cycles and context_material is not None: context_mat_wrap = cycles_material_wrap_map[context_material] context_material_vars.clear() |