diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-01 08:21:22 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-01 08:21:22 +0300 |
| commit | 87b985c47f2488f959ec6b97379419016db9a4f5 (patch) | |
| tree | 7756b58449eac56f0fc5fae74b331730181a5ed8 /io_scene_obj/import_obj.py | |
| parent | 8289d01efa83866e776d869224778801fc9f6cc7 (diff) | |
| parent | 92895af5ddde074624abbc27c09f8ee9ef42a510 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'io_scene_obj/import_obj.py')
| -rw-r--r-- | io_scene_obj/import_obj.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/io_scene_obj/import_obj.py b/io_scene_obj/import_obj.py index 4f3ee24a..d308b649 100644 --- a/io_scene_obj/import_obj.py +++ b/io_scene_obj/import_obj.py @@ -36,10 +36,10 @@ import os import time import bpy import mathutils + from bpy_extras.io_utils import unpack_list from bpy_extras.image_utils import load_image - -from progress_report import ProgressReport, ProgressReportSubstep +from bpy_extras.wm_utils.progress_report import ProgressReport def line_value(line_split): |