[Bf-extensions-cvs] [87b985c4] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 87b985c47f2488f959ec6b97379419016db9a4f5
Author: Campbell Barton
Date:   Thu Nov 1 16:21:22 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBA87b985c47f2488f959ec6b97379419016db9a4f5

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc io_scene_obj/export_obj.py
index 22a82234,05ff4db2..0fe7fbcc
--- a/io_scene_obj/export_obj.py
+++ b/io_scene_obj/export_obj.py
@@@ -21,10 -21,13 +21,13 @@@
  import os
  
  import bpy
 -import mathutils
 -import bpy_extras.io_utils
 +from mathutils import Matrix, Vector, Color
 +from bpy_extras import io_utils, node_shader_utils
  
- from progress_report import ProgressReport, ProgressReportSubstep
+ from bpy_extras.wm_utils.progress_report import (
+     ProgressReport,
+     ProgressReportSubstep,
+ )
  
  
  def name_compat(name):