Compatibility for branches 2.79

Compatible with 2.79 Release and 2.79 Stable Nightly builds. ProgressReport change packedge
johnzero7 · Jan 8, 2019 · af54b56 · af54b56
1 parent 7ce31f9
commit af54b56
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ XPS Tools
 Blender Toolshelf, an addon for Blender to
 
 Import/Export XPS Models, Poses.
-(Requieres Blender 2.74 up)
+(Requieres Blender 2.79)
 
 Main Features:
 - Imports and Exports XPS/XNALara models with armature.

diff --git a/__init__.py b/__init__.py
@@ -4,7 +4,7 @@
 bl_info = {
     "name": "XNALara/XPS Import/Export",
     "author": "johnzero7",
-    "version": (1, 8, 6),
+    "version": (1, 8, 7),
     "blender": (2, 74, 0),
     "location": "File > Import-Export > XNALara/XPS",
     "description": "Import-Export XNALara/XPS",

diff --git a/export_obj.py b/export_obj.py
@@ -27,7 +27,10 @@
 import operator
 import bpy_extras.io_utils
 
-from progress_report import ProgressReport, ProgressReportSubstep
+try:
+    from progress_report import ProgressReport, ProgressReportSubstep
+except ImportError:
+    from bpy_extras.wm_utils.progress_report import ProgressReport, ProgressReportSubstep
 
 
 def name_compat(name):

diff --git a/import_obj.py b/import_obj.py
@@ -41,7 +41,10 @@
 from bpy_extras.io_utils import unpack_list
 from bpy_extras.image_utils import load_image
 
-from progress_report import ProgressReport, ProgressReportSubstep
+try:
+    from progress_report import ProgressReport, ProgressReportSubstep
+except ImportError:
+    from bpy_extras.wm_utils.progress_report import ProgressReport, ProgressReportSubstep
 
 
 def line_value(line_split):