diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-10-04 15:46:32 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-10-04 15:46:32 +0300 |
| commit | 1aa75b050f1f00cc169bc96b00b11f97679ebe4f (patch) | |
| tree | 65a294cede8807e3e06fc3d0e84f4a24066cb88e | |
| parent | e406343288065a73a01610a5b732dae373555d2f (diff) | |
| parent | 6d62e07f8bcd6d09ced189796b26ed905586f267 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
io_scene_obj/__init__.py
io_scene_obj/import_obj.py
| -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 4fc670a9..ac396b7e 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, 4, 0), + "version": (3, 4, 1), "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 8f914d6e..55e7648c 100644 --- a/io_scene_obj/import_obj.py +++ b/io_scene_obj/import_obj.py @@ -148,7 +148,7 @@ def create_materials(filepath, relpath, elif type == 'Bump': bump_mult = map_options.get(b'-bm') - bump_mult = float(bump_mult[0]) if (bump_mult is not None and len(bump_mult) > 1) else 1.0 + bump_mult = float(bump_mult[0]) if (bump_mult and len(bump_mult[0]) > 1) else 1.0 mat_wrap.normalmap_strength_set(bump_mult) _generic_tex_set(mat_wrap.normalmap_texture, image, 'UV', map_offset, map_scale) |