Merge branch 'master' into blender2.8
Conflicts: io_scene_obj/__init__.py io_scene_obj/import_obj.py
This commit is contained in:
commit
1aa75b050f
|
@ -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",
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue