Skip to content

Commit af54b56

Browse files
committed
Compatibility for branches 2.79
Compatible with 2.79 Release and 2.79 Stable Nightly builds. ProgressReport change packedge
1 parent 7ce31f9 commit af54b56

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ XPS Tools
33
Blender Toolshelf, an addon for Blender to
44

55
Import/Export XPS Models, Poses.
6-
(Requieres Blender 2.74 up)
6+
(Requieres Blender 2.79)
77

88
Main Features:
99
- Imports and Exports XPS/XNALara models with armature.

__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
bl_info = {
55
"name": "XNALara/XPS Import/Export",
66
"author": "johnzero7",
7-
"version": (1, 8, 6),
7+
"version": (1, 8, 7),
88
"blender": (2, 74, 0),
99
"location": "File > Import-Export > XNALara/XPS",
1010
"description": "Import-Export XNALara/XPS",

export_obj.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@
2727
import operator
2828
import bpy_extras.io_utils
2929

30-
from progress_report import ProgressReport, ProgressReportSubstep
30+
try:
31+
from progress_report import ProgressReport, ProgressReportSubstep
32+
except ImportError:
33+
from bpy_extras.wm_utils.progress_report import ProgressReport, ProgressReportSubstep
3134

3235

3336
def name_compat(name):

import_obj.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@
4141
from bpy_extras.io_utils import unpack_list
4242
from bpy_extras.image_utils import load_image
4343

44-
from progress_report import ProgressReport, ProgressReportSubstep
44+
try:
45+
from progress_report import ProgressReport, ProgressReportSubstep
46+
except ImportError:
47+
from bpy_extras.wm_utils.progress_report import ProgressReport, ProgressReportSubstep
4548

4649

4750
def line_value(line_split):

0 commit comments

Comments
 (0)