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>2018-10-04 15:41:40 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-10-04 15:43:27 +0300
commit6d62e07f8bcd6d09ced189796b26ed905586f267 (patch)
treec5ad5d020a9d7e285436b70db6360e5dcb531c9f
parente991b71c5e506065d7cf76283baceb674380e33d (diff)
Fix T57055: Import wavefront OBJ does not correctly parse the '-bm' parameter.
Dummy typo, investigation done by @JimG, thanks!
-rw-r--r--io_scene_obj/__init__.py2
-rw-r--r--io_scene_obj/import_obj.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/io_scene_obj/__init__.py b/io_scene_obj/__init__.py
index d15a6cc7..3bebdecd 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, 6),
+ "version": (2, 3, 7),
"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 c4275606..c47e6638 100644
--- a/io_scene_obj/import_obj.py
+++ b/io_scene_obj/import_obj.py
@@ -177,7 +177,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
if use_cycles:
mat_wrap.normal_image_set(image)