diff options
author | nutti <nutti.metro@gmail.com> | 2019-07-31 04:17:05 +0300 |
---|---|---|
committer | nutti <nutti.metro@gmail.com> | 2019-07-31 04:17:05 +0300 |
commit | e24da4d87cd88481b2e74246d9d5b60fbc98b140 (patch) | |
tree | 9195844d6be1c417fe933ef1cb81834f14cef0d9 /magic_uv | |
parent | c03650a2e92c1c243e2f50fe9c66154719d58b40 (diff) |
Magic UV: Release v6.2
Fix bugs
Diffstat (limited to 'magic_uv')
45 files changed, 130 insertions, 117 deletions
diff --git a/magic_uv/__init__.py b/magic_uv/__init__.py index 15818988..045ba216 100644 --- a/magic_uv/__init__.py +++ b/magic_uv/__init__.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" bl_info = { @@ -29,7 +29,7 @@ bl_info = { "author": "Nutti, Mifth, Jace Priester, kgeogeo, mem, imdjs" "Keith (Wahooney) Boshoff, McBuff, MaxRobinot, " "Alexander Milovsky", - "version": (6, 1, 0), + "version": (6, 2, 0), "blender": (2, 80, 0), "location": "See Add-ons Preferences", "description": "UV Toolset. See Add-ons Preferences for details", @@ -76,10 +76,7 @@ def register(): def unregister(): - user_prefs = utils.compatibility.get_user_preferences(bpy.context) - preferences.remove_builtin_menu() - properites.clear_props(bpy.types.Scene) utils.bl_class_registry.BlClassRegistry.unregister() diff --git a/magic_uv/common.py b/magic_uv/common.py index 066fa969..df3597be 100644 --- a/magic_uv/common.py +++ b/magic_uv/common.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" from collections import defaultdict from pprint import pprint diff --git a/magic_uv/lib/__init__.py b/magic_uv/lib/__init__.py index 8ba994d9..3258b6eb 100644 --- a/magic_uv/lib/__init__.py +++ b/magic_uv/lib/__init__.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" if "bpy" in locals(): import importlib diff --git a/magic_uv/op/__init__.py b/magic_uv/op/__init__.py index 25882d9c..cd743b48 100644 --- a/magic_uv/op/__init__.py +++ b/magic_uv/op/__init__.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" if "bpy" in locals(): import importlib diff --git a/magic_uv/op/align_uv.py b/magic_uv/op/align_uv.py index 92ce2a61..31f7cbe8 100644 --- a/magic_uv/op/align_uv.py +++ b/magic_uv/op/align_uv.py @@ -20,8 +20,8 @@ __author__ = "imdjs, Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import math from math import atan2, tan, sin, cos diff --git a/magic_uv/op/align_uv_cursor.py b/magic_uv/op/align_uv_cursor.py index 2189d764..b103de31 100644 --- a/magic_uv/op/align_uv_cursor.py +++ b/magic_uv/op/align_uv_cursor.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import bpy from mathutils import Vector diff --git a/magic_uv/op/copy_paste_uv.py b/magic_uv/op/copy_paste_uv.py index 60cdcc36..5126e241 100644 --- a/magic_uv/op/copy_paste_uv.py +++ b/magic_uv/op/copy_paste_uv.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>, Jace Priester" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import bmesh import bpy.utils diff --git a/magic_uv/op/copy_paste_uv_object.py b/magic_uv/op/copy_paste_uv_object.py index 0b26d1c3..3297f2b8 100644 --- a/magic_uv/op/copy_paste_uv_object.py +++ b/magic_uv/op/copy_paste_uv_object.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import bmesh import bpy diff --git a/magic_uv/op/copy_paste_uv_uvedit.py b/magic_uv/op/copy_paste_uv_uvedit.py index c386e311..7704d1c9 100644 --- a/magic_uv/op/copy_paste_uv_uvedit.py +++ b/magic_uv/op/copy_paste_uv_uvedit.py @@ -20,8 +20,8 @@ __author__ = "imdjs, Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import math from math import atan2, sin, cos diff --git a/magic_uv/op/flip_rotate_uv.py b/magic_uv/op/flip_rotate_uv.py index 7879812e..da8af4c3 100644 --- a/magic_uv/op/flip_rotate_uv.py +++ b/magic_uv/op/flip_rotate_uv.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import bpy import bmesh diff --git a/magic_uv/op/mirror_uv.py b/magic_uv/op/mirror_uv.py index 16fbe9af..d28cf826 100644 --- a/magic_uv/op/mirror_uv.py +++ b/magic_uv/op/mirror_uv.py @@ -20,8 +20,8 @@ __author__ = "Keith (Wahooney) Boshoff, Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import bpy from bpy.props import ( diff --git a/magic_uv/op/move_uv.py b/magic_uv/op/move_uv.py index 90cfdace..881ab378 100644 --- a/magic_uv/op/move_uv.py +++ b/magic_uv/op/move_uv.py @@ -20,8 +20,8 @@ __author__ = "kgeogeo, mem, Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import bpy from bpy.props import BoolProperty diff --git a/magic_uv/op/pack_uv.py b/magic_uv/op/pack_uv.py index 303fa9b0..3589231a 100644 --- a/magic_uv/op/pack_uv.py +++ b/magic_uv/op/pack_uv.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" from math import fabs diff --git a/magic_uv/op/preserve_uv_aspect.py b/magic_uv/op/preserve_uv_aspect.py index 091eee15..c9ba7204 100644 --- a/magic_uv/op/preserve_uv_aspect.py +++ b/magic_uv/op/preserve_uv_aspect.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import bpy from bpy.props import StringProperty, EnumProperty, BoolProperty diff --git a/magic_uv/op/select_uv.py b/magic_uv/op/select_uv.py index 1b0766f8..223f9e2f 100644 --- a/magic_uv/op/select_uv.py +++ b/magic_uv/op/select_uv.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import bpy from bpy.props import BoolProperty diff --git a/magic_uv/op/smooth_uv.py b/magic_uv/op/smooth_uv.py index a00554ac..17068308 100644 --- a/magic_uv/op/smooth_uv.py +++ b/magic_uv/op/smooth_uv.py @@ -20,8 +20,8 @@ __author__ = "imdjs, Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import bpy from bpy.props import BoolProperty, FloatProperty diff --git a/magic_uv/op/texture_lock.py b/magic_uv/op/texture_lock.py index 9f69e259..43d78549 100644 --- a/magic_uv/op/texture_lock.py +++ b/magic_uv/op/texture_lock.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import math from math import atan2, cos, sqrt, sin, fabs diff --git a/magic_uv/op/texture_projection.py b/magic_uv/op/texture_projection.py index a93c9ec3..6ef6b1ce 100644 --- a/magic_uv/op/texture_projection.py +++ b/magic_uv/op/texture_projection.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" from collections import namedtuple diff --git a/magic_uv/op/texture_wrap.py b/magic_uv/op/texture_wrap.py index 20306241..9936a510 100644 --- a/magic_uv/op/texture_wrap.py +++ b/magic_uv/op/texture_wrap.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import bpy from bpy.props import ( diff --git a/magic_uv/op/transfer_uv.py b/magic_uv/op/transfer_uv.py index c287f1ec..b63376c9 100644 --- a/magic_uv/op/transfer_uv.py +++ b/magic_uv/op/transfer_uv.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>, Mifth, MaxRobinot" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" from collections import OrderedDict diff --git a/magic_uv/op/unwrap_constraint.py b/magic_uv/op/unwrap_constraint.py index 970d09d0..bd78dafc 100644 --- a/magic_uv/op/unwrap_constraint.py +++ b/magic_uv/op/unwrap_constraint.py @@ -18,8 +18,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import bpy from bpy.props import ( diff --git a/magic_uv/op/uv_bounding_box.py b/magic_uv/op/uv_bounding_box.py index b7c6620c..589abcc4 100644 --- a/magic_uv/op/uv_bounding_box.py +++ b/magic_uv/op/uv_bounding_box.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" from enum import IntEnum import math diff --git a/magic_uv/op/uv_inspection.py b/magic_uv/op/uv_inspection.py index 356a97b7..c5f92004 100644 --- a/magic_uv/op/uv_inspection.py +++ b/magic_uv/op/uv_inspection.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import bpy from bpy.props import BoolProperty, EnumProperty diff --git a/magic_uv/op/uv_sculpt.py b/magic_uv/op/uv_sculpt.py index 5582772f..ff3a9db3 100644 --- a/magic_uv/op/uv_sculpt.py +++ b/magic_uv/op/uv_sculpt.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" from math import pi, cos, tan, sin diff --git a/magic_uv/op/uvw.py b/magic_uv/op/uvw.py index 2bbc9a77..4b4a4f04 100644 --- a/magic_uv/op/uvw.py +++ b/magic_uv/op/uvw.py @@ -20,8 +20,8 @@ __author__ = "Alexander Milovsky, Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" from math import sin, cos, pi diff --git a/magic_uv/op/world_scale_uv.py b/magic_uv/op/world_scale_uv.py index 11b38bff..0107fc6f 100644 --- a/magic_uv/op/world_scale_uv.py +++ b/magic_uv/op/world_scale_uv.py @@ -20,8 +20,8 @@ __author__ = "McBuff, Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" from math import sqrt diff --git a/magic_uv/preferences.py b/magic_uv/preferences.py index ded1626c..6d66b308 100644 --- a/magic_uv/preferences.py +++ b/magic_uv/preferences.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import bpy from bpy.props import ( @@ -58,7 +58,7 @@ from .ui.IMAGE_MT_uvs import ( MUV_MT_UVInspection, ) from .utils.bl_class_registry import BlClassRegistry -from .utils.addon_updator import AddonUpdatorManager +from .utils.addon_updater import AddonUpdaterManager from .utils import compatibility as compat from . import updater @@ -165,7 +165,7 @@ def remove_builtin_menu(): def get_update_candidate_branches(_, __): - manager = AddonUpdatorManager.get_instance() + manager = AddonUpdaterManager.get_instance() if not manager.candidate_checked(): return [] diff --git a/magic_uv/properites.py b/magic_uv/properites.py index d7e92bb0..e553816b 100644 --- a/magic_uv/properites.py +++ b/magic_uv/properites.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" from .utils.property_class_registry import PropertyClassRegistry diff --git a/magic_uv/ui/IMAGE_MT_uvs.py b/magic_uv/ui/IMAGE_MT_uvs.py index f723a007..74e796cc 100644 --- a/magic_uv/ui/IMAGE_MT_uvs.py +++ b/magic_uv/ui/IMAGE_MT_uvs.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import bpy diff --git a/magic_uv/ui/VIEW3D_MT_object.py b/magic_uv/ui/VIEW3D_MT_object.py index 54f0c3b0..b4fca522 100644 --- a/magic_uv/ui/VIEW3D_MT_object.py +++ b/magic_uv/ui/VIEW3D_MT_object.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import bpy diff --git a/magic_uv/ui/VIEW3D_MT_uv_map.py b/magic_uv/ui/VIEW3D_MT_uv_map.py index 28a125f5..853d1855 100644 --- a/magic_uv/ui/VIEW3D_MT_uv_map.py +++ b/magic_uv/ui/VIEW3D_MT_uv_map.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import bpy.utils diff --git a/magic_uv/ui/__init__.py b/magic_uv/ui/__init__.py index 57f6a9d8..50049251 100644 --- a/magic_uv/ui/__init__.py +++ b/magic_uv/ui/__init__.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" if "bpy" in locals(): import importlib diff --git a/magic_uv/ui/uvedit_copy_paste_uv.py b/magic_uv/ui/uvedit_copy_paste_uv.py index 91705a66..987a24a0 100644 --- a/magic_uv/ui/uvedit_copy_paste_uv.py +++ b/magic_uv/ui/uvedit_copy_paste_uv.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import bpy diff --git a/magic_uv/ui/uvedit_editor_enhancement.py b/magic_uv/ui/uvedit_editor_enhancement.py index f30e0c58..6639650c 100644 --- a/magic_uv/ui/uvedit_editor_enhancement.py +++ b/magic_uv/ui/uvedit_editor_enhancement.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import bpy diff --git a/magic_uv/ui/uvedit_uv_manipulation.py b/magic_uv/ui/uvedit_uv_manipulation.py index ec2045ca..5589b73e 100644 --- a/magic_uv/ui/uvedit_uv_manipulation.py +++ b/magic_uv/ui/uvedit_uv_manipulation.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import bpy diff --git a/magic_uv/ui/view3d_copy_paste_uv_editmode.py b/magic_uv/ui/view3d_copy_paste_uv_editmode.py index 65039425..041f279d 100644 --- a/magic_uv/ui/view3d_copy_paste_uv_editmode.py +++ b/magic_uv/ui/view3d_copy_paste_uv_editmode.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import bpy diff --git a/magic_uv/ui/view3d_copy_paste_uv_objectmode.py b/magic_uv/ui/view3d_copy_paste_uv_objectmode.py index 8717fc94..21d2bc4c 100644 --- a/magic_uv/ui/view3d_copy_paste_uv_objectmode.py +++ b/magic_uv/ui/view3d_copy_paste_uv_objectmode.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import bpy diff --git a/magic_uv/ui/view3d_uv_manipulation.py b/magic_uv/ui/view3d_uv_manipulation.py index eced8d06..3a694008 100644 --- a/magic_uv/ui/view3d_uv_manipulation.py +++ b/magic_uv/ui/view3d_uv_manipulation.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import bpy diff --git a/magic_uv/ui/view3d_uv_mapping.py b/magic_uv/ui/view3d_uv_mapping.py index 67b826fa..0e31620b 100644 --- a/magic_uv/ui/view3d_uv_mapping.py +++ b/magic_uv/ui/view3d_uv_mapping.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import bpy diff --git a/magic_uv/updater.py b/magic_uv/updater.py index e6242d98..d522c009 100644 --- a/magic_uv/updater.py +++ b/magic_uv/updater.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import os @@ -31,9 +31,9 @@ from bpy.props import ( ) from .utils.bl_class_registry import BlClassRegistry -from .utils.addon_updator import ( - AddonUpdatorManager, - AddonUpdatorConfig, +from .utils.addon_updater import ( + AddonUpdaterManager, + AddonUpdaterConfig, get_separator, ) from .utils import compatibility as compat @@ -47,7 +47,7 @@ class MUV_OT_CheckAddonUpdate(bpy.types.Operator): bl_options = {'REGISTER', 'UNDO'} def execute(self, _): - updater = AddonUpdatorManager.get_instance() + updater = AddonUpdaterManager.get_instance() updater.check_update_candidate() return {'FINISHED'} @@ -68,7 +68,7 @@ class MUV_OT_UpdateAddon(bpy.types.Operator): ) def execute(self, _): - updater = AddonUpdatorManager.get_instance() + updater = AddonUpdaterManager.get_instance() updater.update(self.branch_name) return {'FINISHED'} @@ -76,7 +76,7 @@ class MUV_OT_UpdateAddon(bpy.types.Operator): def draw_updater_ui(prefs_obj): layout = prefs_obj.layout - updater = AddonUpdatorManager.get_instance() + updater = AddonUpdaterManager.get_instance() layout.separator() @@ -127,7 +127,7 @@ def draw_updater_ui(prefs_obj): def register_updater(bl_info): - config = AddonUpdatorConfig() + config = AddonUpdaterConfig() config.owner = "nutti" config.repository = "Magic-UV" config.current_addon_path = os.path.dirname(os.path.realpath(__file__)) @@ -136,6 +136,10 @@ def register_updater(bl_info): config.current_addon_path[ :config.current_addon_path.rfind(get_separator())] config.min_release_version = bl_info["version"] - config.target_addon_path = "src/magic_uv" - updater = AddonUpdatorManager.get_instance() + config.default_target_addon_path = "magic_uv" + config.target_addon_path = { + "master": "src{}magic_uv".format(get_separator()), + "develop": "src{}magic_uv".format(get_separator()), + } + updater = AddonUpdaterManager.get_instance() updater.init(bl_info, config) diff --git a/magic_uv/utils/__init__.py b/magic_uv/utils/__init__.py index 8b99470e..0e6ef744 100644 --- a/magic_uv/utils/__init__.py +++ b/magic_uv/utils/__init__.py @@ -20,17 +20,17 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" if "bpy" in locals(): import importlib - importlib.reload(addon_updator) + importlib.reload(addon_updater) importlib.reload(bl_class_registry) importlib.reload(compatibility) importlib.reload(property_class_registry) else: - from . import addon_updator + from . import addon_updater from . import bl_class_registry from . import compatibility from . import property_class_registry diff --git a/magic_uv/utils/addon_updator.py b/magic_uv/utils/addon_updater.py index 1ef522fb..2f3d0c0f 100644 --- a/magic_uv/utils/addon_updator.py +++ b/magic_uv/utils/addon_updater.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" from threading import Lock import urllib @@ -75,7 +75,7 @@ def _download(url, path): def _make_workspace_path(addon_dir): - return addon_dir + get_separator() + "addon_updator_workspace" + return addon_dir + get_separator() + "addon_updater_workspace" def _make_workspace(addon_dir): @@ -161,7 +161,7 @@ def _compare_version(ver1, ver2): return comp(ver1, ver2, 0) -class AddonUpdatorConfig: +class AddonUpdaterConfig: def __init__(self): # Name of owner self.owner = "" @@ -179,7 +179,13 @@ class AddonUpdatorConfig: self.min_release_version = (-1, -1) # Target add-on path - self.target_addon_path = "" + # {"branch/tag": "add-on path"} + self.target_addon_path = {} + + # Default target add-on path. + # Search this path if branch/tag is not found in + # self.target_addon_path. + self.default_target_addon_path = "" # Current add-on path self.current_addon_path = "" @@ -195,7 +201,7 @@ class UpdateCandidateInfo: self.group = "" # BRANCH|RELEASE -class AddonUpdatorManager: +class AddonUpdaterManager: __inst = None __lock = Lock() @@ -240,7 +246,7 @@ class AddonUpdatorManager: def check_update_candidate(self): if not self.initialized(): - raise RuntimeError("AddonUpdatorManager must be initialized") + raise RuntimeError("AddonUpdaterManager must be initialized") self.__update_candidate = [] self.__candidate_checked = False @@ -293,7 +299,7 @@ class AddonUpdatorManager: def update(self, version_name): if not self.initialized(): - raise RuntimeError("AddonUpdatorManager must be initialized.") + raise RuntimeError("AddonUpdaterManager must be initialized.") if not self.candidate_checked(): raise RuntimeError("Update candidate is not checked.") @@ -315,14 +321,20 @@ class AddonUpdatorManager: # download add-on _download_addon(self.__config.addon_directory, info.url) + # get add-on path + if info.name in self.__config.target_addon_path: + addon_path = self.__config.target_addon_path[info.name] + else: + addon_path = self.__config.default_target_addon_path + # replace add-on offset_path = "" if info.group == 'BRANCH': offset_path = "{}-{}{}{}".format( self.__config.repository, info.name, get_separator(), - self.__config.target_addon_path) + addon_path) elif info.group == 'RELEASE': - offset_path = self.__config.target_addon_path + offset_path = addon_path _replace_addon(self.__config.addon_directory, info, self.__config.current_addon_path, offset_path) @@ -337,7 +349,7 @@ class AddonUpdatorManager: def get_candidate_branch_names(self): if not self.initialized(): - raise RuntimeError("AddonUpdatorManager must be initialized.") + raise RuntimeError("AddonUpdaterManager must be initialized.") if not self.candidate_checked(): raise RuntimeError("Update candidate is not checked.") diff --git a/magic_uv/utils/bl_class_registry.py b/magic_uv/utils/bl_class_registry.py index 0cd86600..826f1483 100644 --- a/magic_uv/utils/bl_class_registry.py +++ b/magic_uv/utils/bl_class_registry.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import bpy diff --git a/magic_uv/utils/compatibility.py b/magic_uv/utils/compatibility.py index 9cd754aa..6b7da000 100644 --- a/magic_uv/utils/compatibility.py +++ b/magic_uv/utils/compatibility.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" import bpy import bgl @@ -81,7 +81,7 @@ def matmul(m1, m2): def layout_split(layout, factor=0.0, align=False): if check_version(2, 80, 0) < 0: - return layout.split(factor=factor, align=align) + return layout.split(percentage=factor, align=align) return layout.split(factor=factor, align=align) diff --git a/magic_uv/utils/property_class_registry.py b/magic_uv/utils/property_class_registry.py index 6cf5f6a8..dff4712f 100644 --- a/magic_uv/utils/property_class_registry.py +++ b/magic_uv/utils/property_class_registry.py @@ -20,8 +20,8 @@ __author__ = "Nutti <nutti.metro@gmail.com>" __status__ = "production" -__version__ = "6.1" -__date__ = "19 May 2019" +__version__ = "6.2" +__date__ = "31 Jul 2019" from .. import common |