[Bf-extensions-cvs] [800dc7e3] master: Magic UV: Replace deprecated imp call, mode fix
lijenstina
noreply at git.blender.org
Tue Jun 6 21:54:04 CEST 2017
Commit: 800dc7e3306413effcd1b683f7eeca0d602a78cf
Author: lijenstina
Date: Tue Jun 6 21:53:03 2017 +0200
Branches: master
https://developer.blender.org/rBA800dc7e3306413effcd1b683f7eeca0d602a78cf
Magic UV: Replace deprecated imp call, mode fix
Bump version to 4.3.1
Replace the deprecated imp calls with importlib
Imports as tuples
Some minor cleanup
Fix crash with MUV_TexProjProject by checking for edit mode,
add a poll for active object of type Mesh
Fix crash with MUV_PreserveUVAspect not having an image
in the faces loop tex data in certain cases
===================================================================
M uv_magic_uv/__init__.py
M uv_magic_uv/muv_common.py
M uv_magic_uv/muv_cpuv_ops.py
M uv_magic_uv/muv_cpuv_selseq_ops.py
M uv_magic_uv/muv_fliprot_ops.py
M uv_magic_uv/muv_menu.py
M uv_magic_uv/muv_mirroruv_ops.py
M uv_magic_uv/muv_mvuv_ops.py
M uv_magic_uv/muv_packuv_ops.py
M uv_magic_uv/muv_preferences.py
M uv_magic_uv/muv_preserve_uv_aspect.py
M uv_magic_uv/muv_props.py
M uv_magic_uv/muv_texlock_ops.py
M uv_magic_uv/muv_texproj_ops.py
M uv_magic_uv/muv_transuv_ops.py
M uv_magic_uv/muv_unwrapconst_ops.py
M uv_magic_uv/muv_uvbb_ops.py
M uv_magic_uv/muv_wsuv_ops.py
===================================================================
diff --git a/uv_magic_uv/__init__.py b/uv_magic_uv/__init__.py
index dd236667..01d3582a 100644
--- a/uv_magic_uv/__init__.py
+++ b/uv_magic_uv/__init__.py
@@ -20,43 +20,45 @@
__author__ = "Nutti <nutti.metro at gmail.com>"
__status__ = "production"
-__version__ = "4.3"
-__date__ = "1 Apr 2017"
+__version__ = "4.3.1"
+__date__ = "6 June 2017"
bl_info = {
"name": "Magic UV",
- "author": "Nutti, Mifth, Jace Priester, kgeogeo, mem, Keith (Wahooney) Boshoff, McBuff, MaxRobinot",
- "version": (4, 3),
+ "author": "Nutti, Mifth, Jace Priester, kgeogeo, mem, "
+ "Keith (Wahooney) Boshoff, McBuff, MaxRobinot",
+ "version": (4, 3, 1),
"blender": (2, 77, 0),
"location": "See Add-ons Preferences",
"description": "UV Manipulator Tools. See Add-ons Preferences for details",
"warning": "",
"support": "COMMUNITY",
- "wiki_url": "https://wiki.blender.org/index.php/Extensions:2.6/Py/Scripts/UV/Magic_UV",
+ "wiki_url": "https://wiki.blender.org/index.php/Extensions:2.6/"
+ "Py/Scripts/UV/Magic_UV",
"tracker_url": "https://github.com/nutti/Magic-UV",
"category": "UV"
}
if "bpy" in locals():
- import imp
- imp.reload(muv_preferences)
- imp.reload(muv_menu)
- imp.reload(muv_common)
- imp.reload(muv_props)
- imp.reload(muv_cpuv_ops)
- imp.reload(muv_cpuv_selseq_ops)
- imp.reload(muv_fliprot_ops)
- imp.reload(muv_transuv_ops)
- imp.reload(muv_uvbb_ops)
- imp.reload(muv_mvuv_ops)
- imp.reload(muv_texproj_ops)
- imp.reload(muv_packuv_ops)
- imp.reload(muv_texlock_ops)
- imp.reload(muv_mirroruv_ops)
- imp.reload(muv_wsuv_ops)
- imp.reload(muv_unwrapconst_ops)
- imp.reload(muv_preserve_uv_aspect)
+ import importlib
+ importlib.reload(muv_preferences)
+ importlib.reload(muv_menu)
+ importlib.reload(muv_common)
+ importlib.reload(muv_props)
+ importlib.reload(muv_cpuv_ops)
+ importlib.reload(muv_cpuv_selseq_ops)
+ importlib.reload(muv_fliprot_ops)
+ importlib.reload(muv_transuv_ops)
+ importlib.reload(muv_uvbb_ops)
+ importlib.reload(muv_mvuv_ops)
+ importlib.reload(muv_texproj_ops)
+ importlib.reload(muv_packuv_ops)
+ importlib.reload(muv_texlock_ops)
+ importlib.reload(muv_mirroruv_ops)
+ importlib.reload(muv_wsuv_ops)
+ importlib.reload(muv_unwrapconst_ops)
+ importlib.reload(muv_preserve_uv_aspect)
else:
from . import muv_preferences
from . import muv_menu
diff --git a/uv_magic_uv/muv_common.py b/uv_magic_uv/muv_common.py
index 66f2a54b..121915e8 100644
--- a/uv_magic_uv/muv_common.py
+++ b/uv_magic_uv/muv_common.py
@@ -20,9 +20,8 @@
__author__ = "Nutti <nutti.metro at gmail.com>"
__status__ = "production"
-__version__ = "4.3"
-__date__ = "1 Apr 2017"
-
+__version__ = "4.3.1"
+__date__ = "6 June 2017"
import bpy
from . import muv_props
diff --git a/uv_magic_uv/muv_cpuv_ops.py b/uv_magic_uv/muv_cpuv_ops.py
index fbf1764f..3ef1a9de 100644
--- a/uv_magic_uv/muv_cpuv_ops.py
+++ b/uv_magic_uv/muv_cpuv_ops.py
@@ -20,13 +20,17 @@
__author__ = "Nutti <nutti.metro at gmail.com>, Jace Priester"
__status__ = "production"
-__version__ = "4.3"
+__version__ = "4.3.1"
__date__ = "1 Apr 2017"
-
import bpy
import bmesh
-from bpy.props import StringProperty, BoolProperty, IntProperty, EnumProperty
+from bpy.props import (
+ StringProperty,
+ BoolProperty,
+ IntProperty,
+ EnumProperty,
+ )
from . import muv_common
@@ -399,8 +403,8 @@ class MUV_CPUVObjPasteUV(bpy.types.Operator):
if len(props.src_uvs) != len(dest_uvs):
self.report(
{'WARNING'},
- "Number of faces is different from copied "
- + "(src:%d, dest:%d)"
+ "Number of faces is different from copied " +
+ "(src:%d, dest:%d)"
% (len(props.src_uvs), len(dest_uvs))
)
return {'CANCELLED'}
diff --git a/uv_magic_uv/muv_cpuv_selseq_ops.py b/uv_magic_uv/muv_cpuv_selseq_ops.py
index 37e9f8de..bbb9de5a 100644
--- a/uv_magic_uv/muv_cpuv_selseq_ops.py
+++ b/uv_magic_uv/muv_cpuv_selseq_ops.py
@@ -20,13 +20,17 @@
__author__ = "Nutti <nutti.metro at gmail.com>"
__status__ = "production"
-__version__ = "4.3"
-__date__ = "1 Apr 2017"
-
+__version__ = "4.3.1"
+__date__ = "6 June 2017"
import bpy
import bmesh
-from bpy.props import StringProperty, BoolProperty, IntProperty, EnumProperty
+from bpy.props import (
+ StringProperty,
+ BoolProperty,
+ IntProperty,
+ EnumProperty,
+ )
from . import muv_common
@@ -180,8 +184,8 @@ class MUV_CPUVSelSeqPasteUV(bpy.types.Operator):
if self.strategy == 'N_N' and len(props.src_uvs) != len(dest_uvs):
self.report(
{'WARNING'},
- "Number of selected faces is different from copied faces "
- + "(src:%d, dest:%d)"
+ "Number of selected faces is different from copied faces " +
+ "(src:%d, dest:%d)"
% (len(props.src_uvs), len(dest_uvs)))
return {'CANCELLED'}
diff --git a/uv_magic_uv/muv_fliprot_ops.py b/uv_magic_uv/muv_fliprot_ops.py
index 597ee2a6..2c72d643 100644
--- a/uv_magic_uv/muv_fliprot_ops.py
+++ b/uv_magic_uv/muv_fliprot_ops.py
@@ -20,13 +20,15 @@
__author__ = "Nutti <nutti.metro at gmail.com>"
__status__ = "production"
-__version__ = "4.3"
-__date__ = "1 Apr 2017"
-
+__version__ = "4.3.1"
+__date__ = "6 June 2017"
import bpy
import bmesh
-from bpy.props import BoolProperty, IntProperty
+from bpy.props import (
+ BoolProperty,
+ IntProperty,
+ )
from . import muv_common
diff --git a/uv_magic_uv/muv_menu.py b/uv_magic_uv/muv_menu.py
index fd4ef205..b177e9c8 100644
--- a/uv_magic_uv/muv_menu.py
+++ b/uv_magic_uv/muv_menu.py
@@ -20,9 +20,8 @@
__author__ = "Nutti <nutti.metro at gmail.com>"
__status__ = "production"
-__version__ = "4.3"
-__date__ = "1 Apr 2017"
-
+__version__ = "4.3.1"
+__date__ = "6 June 2017"
import bpy
from . import muv_cpuv_ops
diff --git a/uv_magic_uv/muv_mirroruv_ops.py b/uv_magic_uv/muv_mirroruv_ops.py
index d0a98b87..5fc2ac4c 100644
--- a/uv_magic_uv/muv_mirroruv_ops.py
+++ b/uv_magic_uv/muv_mirroruv_ops.py
@@ -20,12 +20,14 @@
__author__ = "Keith (Wahooney) Boshoff, Nutti <nutti.metro at gmail.com>"
__status__ = "production"
-__version__ = "4.3"
-__date__ = "1 Apr 2017"
-
+__version__ = "4.3.1"
+__date__ = "6 June 2017"
import bpy
-from bpy.props import EnumProperty, FloatProperty
+from bpy.props import (
+ EnumProperty,
+ FloatProperty,
+ )
import bmesh
from mathutils import Vector
from . import muv_common
diff --git a/uv_magic_uv/muv_mvuv_ops.py b/uv_magic_uv/muv_mvuv_ops.py
index 2eb0991f..192d7f21 100644
--- a/uv_magic_uv/muv_mvuv_ops.py
+++ b/uv_magic_uv/muv_mvuv_ops.py
@@ -20,9 +20,8 @@
__author__ = "kgeogeo, mem, Nutti <nutti.metro at gmail.com>"
__status__ = "production"
-__version__ = "4.3"
-__date__ = "1 Apr 2017"
-
+__version__ = "4.3.1"
+__date__ = "6 June 2017"
import bpy
import bmesh
diff --git a/uv_magic_uv/muv_packuv_ops.py b/uv_magic_uv/muv_packuv_ops.py
index 06e79e7a..829bf605 100644
--- a/uv_magic_uv/muv_packuv_ops.py
+++ b/uv_magic_uv/muv_packuv_ops.py
@@ -20,9 +20,8 @@
__author__ = "Nutti <nutti.metro at gmail.com>"
__status__ = "production"
-__version__ = "4.3"
-__date__ = "1 Apr 2017"
-
+__version__ = "4.3.1"
+__date__ = "6 June 2017"
from math import fabs
from collections import defaultdict
@@ -30,7 +29,11 @@ from collections import defaultdict
import bpy
import bmesh
import mathutils
-from bpy.props import FloatProperty, FloatVectorProperty, BoolProperty
+from bpy.props import (
+ FloatProperty,
+ FloatVectorProperty,
+ BoolProperty,
+ )
from mathutils import Vector
from . import muv_common
diff --git a/uv_magic_uv/muv_preferences.py b/uv_magic_uv/muv_preferences.py
index 7e13c6ea..f80ad28e 100644
--- a/uv_magic_uv/muv_preferences.py
+++ b/uv_magic_uv/muv_preferences.py
@@ -20,11 +20,14 @@
__author__ = "Nutti <nutti.metro at gmail.com>"
__status__ = "production"
-__version__ = "4.3"
-__date__ = "1 Apr 2017"
-
-
-from bpy.props import BoolProperty, FloatProperty, FloatVectorProperty
+__version__ = "4.3.1"
+__date__ = "6 June 2017"
+
+from bpy.props import (
+ BoolProperty,
+ FloatProperty,
+ FloatVectorProperty,
+ )
from bpy.types import AddonPreferences
@@ -44,7 +47,7 @@ class MUV_Preferences(AddonPreferences):
# for Texture Projection
texproj_canvas_padding = FloatVectorProperty(
name="Canvas Padding",
- description="Canvas Padding.",
+ description="Canvas Padding",
size=2,
max=50.0,
min=0.0,
diff --git a/uv_magic_uv/muv_preserve_uv_aspect.py b/uv_magic_uv/muv_preserve_uv_aspect.py
index 0fbb820d..bc9ce3eb 100644
--- a/uv_magic_uv/muv_preserve_uv_aspect.py
+++ b/uv_magic_uv/muv_preserve_uv_aspect.py
@@ -20,9 +20,8 @@
__author__ = "Nutti <nutti.metro at gmail.com>"
__status__ = "production"
-__version__ = "4.3"
-__date__ = "1 Apr 2017"
-
+__version__ = "4.3.1"
+__date__ = "6 June 2017"
import bpy
import bmesh
@@ -38,6 +37,7 @@ class MUV_PreserveUVAspect(bpy.types.Operator):
bl_idname = "uv.muv_preserve_uv_aspect"
bl_label = "Preserve UV Aspect"
+ bl_description = "Choose Image"
bl_options = {'REGISTER', 'UNDO'}
dest_img_name = StringProperty(options={'HIDDEN'})
@@ -48,6 +48,9 @@ class MUV_PreserveUVAspect(bpy.types.Operator):
return obj and obj.type == 'MESH'
def execute(self, context):
+ # Note: the current system only works if the
+ # f[tex_layer].image doesn't return None
+ # which will happen in certain cases
obj = context.active_object
bm = bmesh.from_edit_mesh(obj.data)
@@ -57,6 +60,7 @@ class MUV_PreserveUVAspect(bpy.types.Operator):
if not bm.loops.layers.uv:
self.report({'WARNING'}, "Object must have more than one UV map")
return {'CANCELLED'}
+
uv_layer = bm.loops.layers.uv.verify()
tex_layer = bm.faces.la
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list