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-01-11 13:00:38 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2019-01-11 13:00:38 +0300
commit5509187b4dc331a3d7efb0d70baf691041341276 (patch)
tree453ec0f45a782b17838303f70147ed2950143ccf /io_scene_obj
parent9448cef00d1b3ac3e4c58e7278d726fd9d2f95da (diff)
Fix second part of T60381: OBJ import of textures would fail when map scale/offset was specified.
Diffstat (limited to 'io_scene_obj')
-rw-r--r--io_scene_obj/import_obj.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/io_scene_obj/import_obj.py b/io_scene_obj/import_obj.py
index 8050b683..1b30a37b 100644
--- a/io_scene_obj/import_obj.py
+++ b/io_scene_obj/import_obj.py
@@ -125,6 +125,10 @@ def create_materials(filepath, relpath,
map_offset = map_options.get(b'-o')
map_scale = map_options.get(b'-s')
+ if map_offset is not None:
+ map_offset = tuple(map(float_func, map_offset))
+ if map_scale is not None:
+ map_scale = tuple(map(float_func, map_scale))
def _generic_tex_set(nodetex, image, texcoords, translation, scale):
nodetex.image = image