[Bf-extensions-cvs] [85a2b50e] master: Magic UV: release v4.5
Nutti
noreply at git.blender.org
Sun Nov 19 07:36:12 CET 2017
Commit: 85a2b50e0e3d505f702a172efc0befa46e87d853
Author: Nutti
Date: Sun Nov 19 15:35:57 2017 +0900
Branches: master
https://developer.blender.org/rBA85a2b50e0e3d505f702a172efc0befa46e87d853
Magic UV: release v4.5
===================================================================
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
A uv_magic_uv/muv_uvw_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 6b9b6d2b..171a5ac4 100644
--- a/uv_magic_uv/__init__.py
+++ b/uv_magic_uv/__init__.py
@@ -20,15 +20,15 @@
__author__ = "Nutti <nutti.metro at gmail.com>"
__status__ = "production"
-__version__ = "4.4"
-__date__ = "2 Aug 2017"
+__version__ = "4.5"
+__date__ = "19 Nov 2017"
bl_info = {
"name": "Magic UV",
"author": "Nutti, Mifth, Jace Priester, kgeogeo, mem, "
- "Keith (Wahooney) Boshoff, McBuff, MaxRobinot",
- "version": (4, 4, 0),
+ "Keith (Wahooney) Boshoff, McBuff, MaxRobinot, Alexander Milovsky",
+ "version": (4, 5, 0),
"blender": (2, 79, 0),
"location": "See Add-ons Preferences",
"description": "UV Manipulator Tools. See Add-ons Preferences for details",
@@ -59,6 +59,7 @@ if "bpy" in locals():
importlib.reload(muv_wsuv_ops)
importlib.reload(muv_unwrapconst_ops)
importlib.reload(muv_preserve_uv_aspect)
+ importlib.reload(muv_uvw_ops)
else:
from . import muv_preferences
from . import muv_menu
@@ -77,6 +78,7 @@ else:
from . import muv_wsuv_ops
from . import muv_unwrapconst_ops
from . import muv_preserve_uv_aspect
+ from . import muv_uvw_ops
import bpy
@@ -84,7 +86,8 @@ import bpy
def view3d_uvmap_menu_fn(self, context):
self.layout.separator()
self.layout.menu(muv_menu.MUV_CPUVMenu.bl_idname, icon="IMAGE_COL")
- self.layout.operator(muv_fliprot_ops.MUV_FlipRot.bl_idname, icon="IMAGE_COL")
+ self.layout.operator(
+ muv_fliprot_ops.MUV_FlipRot.bl_idname, icon="IMAGE_COL")
self.layout.menu(muv_menu.MUV_TransUVMenu.bl_idname, icon="IMAGE_COL")
self.layout.operator(muv_mvuv_ops.MUV_MVUV.bl_idname, icon="IMAGE_COL")
self.layout.menu(muv_menu.MUV_TexLockMenu.bl_idname, icon="IMAGE_COL")
@@ -96,6 +99,7 @@ def view3d_uvmap_menu_fn(self, context):
self.layout.menu(
muv_preserve_uv_aspect.MUV_PreserveUVAspectMenu.bl_idname,
icon='IMAGE_COL')
+ self.layout.menu(muv_menu.MUV_UVWMenu.bl_idname, icon="IMAGE_COL")
def image_uvs_menu_fn(self, context):
diff --git a/uv_magic_uv/muv_common.py b/uv_magic_uv/muv_common.py
index ff2fe3f0..b52971ec 100644
--- a/uv_magic_uv/muv_common.py
+++ b/uv_magic_uv/muv_common.py
@@ -20,8 +20,8 @@
__author__ = "Nutti <nutti.metro at gmail.com>"
__status__ = "production"
-__version__ = "4.4"
-__date__ = "2 Aug 2017"
+__version__ = "4.5"
+__date__ = "19 Nov 2017"
import bpy
from . import muv_props
@@ -45,11 +45,9 @@ def check_version(major, minor, _):
return 0
if bpy.app.version[0] > major:
return 1
- else:
- if bpy.app.version[1] > minor:
- return 1
- else:
- return -1
+ if bpy.app.version[1] > minor:
+ return 1
+ return -1
def redraw_all_areas():
diff --git a/uv_magic_uv/muv_cpuv_ops.py b/uv_magic_uv/muv_cpuv_ops.py
index c3e0e6a3..82f043c6 100644
--- a/uv_magic_uv/muv_cpuv_ops.py
+++ b/uv_magic_uv/muv_cpuv_ops.py
@@ -20,17 +20,17 @@
__author__ = "Nutti <nutti.metro at gmail.com>, Jace Priester"
__status__ = "production"
-__version__ = "4.4"
-__date__ = "2 Aug 2017"
+__version__ = "4.5"
+__date__ = "19 Nov 2017"
import bpy
import bmesh
from bpy.props import (
- StringProperty,
- BoolProperty,
- IntProperty,
- EnumProperty,
- )
+ StringProperty,
+ BoolProperty,
+ IntProperty,
+ EnumProperty,
+)
from . import muv_common
@@ -85,11 +85,11 @@ class MUV_CPUVCopyUV(bpy.types.Operator):
if face.select:
uvs = [l[uv_layer].uv.copy() for l in face.loops]
pin_uvs = [l[uv_layer].pin_uv for l in face.loops]
- seams = [l.edge.seam for l in face.loops]
+ seams = [l.edge.seam for l in face.loops]
props.src_uvs.append(uvs)
props.src_pin_uvs.append(pin_uvs)
props.src_seams.append(seams)
- if len(props.src_uvs) == 0 or len(props.src_pin_uvs) == 0:
+ if not props.src_uvs or not props.src_pin_uvs:
self.report({'WARNING'}, "No faces are selected")
return {'CANCELLED'}
self.report({'INFO'}, "%d face(s) are selected" % len(props.src_uvs))
@@ -164,7 +164,7 @@ class MUV_CPUVPasteUV(bpy.types.Operator):
def execute(self, context):
props = context.scene.muv_props.cpuv
- if len(props.src_uvs) == 0 or len(props.src_pin_uvs) == 0:
+ if not props.src_uvs or not props.src_pin_uvs:
self.report({'WARNING'}, "Need copy UV at first")
return {'CANCELLED'}
if self.uv_map == "":
@@ -201,7 +201,7 @@ class MUV_CPUVPasteUV(bpy.types.Operator):
dest_uvs.append(uvs)
dest_pin_uvs.append(pin_uvs)
dest_seams.append(seams)
- if len(dest_uvs) == 0 or len(dest_pin_uvs) == 0:
+ if not dest_uvs or not dest_pin_uvs:
self.report({'WARNING'}, "No faces are selected")
return {'CANCELLED'}
if self.strategy == 'N_N' and len(props.src_uvs) != len(dest_uvs):
@@ -248,7 +248,8 @@ class MUV_CPUVPasteUV(bpy.types.Operator):
spuvs_fr.insert(0, pin_uv)
ss_fr.insert(0, s)
# paste UVs
- for l, suv, spuv, ss in zip(bm.faces[idx].loops, suvs_fr, spuvs_fr, ss_fr):
+ for l, suv, spuv, ss in zip(bm.faces[idx].loops, suvs_fr,
+ spuvs_fr, ss_fr):
l[uv_layer].uv = suv
l[uv_layer].pin_uv = spuv
if self.copy_seams is True:
@@ -331,7 +332,7 @@ class MUV_CPUVObjCopyUV(bpy.types.Operator):
for face in bm.faces:
uvs = [l[uv_layer].uv.copy() for l in face.loops]
pin_uvs = [l[uv_layer].pin_uv for l in face.loops]
- seams = [l.edge.seam for l in face.loops]
+ seams = [l.edge.seam for l in face.loops]
props.src_uvs.append(uvs)
props.src_pin_uvs.append(pin_uvs)
props.src_seams.append(seams)
@@ -383,7 +384,7 @@ class MUV_CPUVObjPasteUV(bpy.types.Operator):
@memorize_view_3d_mode
def execute(self, context):
props = context.scene.muv_props.cpuv_obj
- if len(props.src_uvs) == 0 or len(props.src_pin_uvs) == 0:
+ if not props.src_uvs or not props.src_pin_uvs:
self.report({'WARNING'}, "Need copy UV at first")
return {'CANCELLED'}
diff --git a/uv_magic_uv/muv_cpuv_selseq_ops.py b/uv_magic_uv/muv_cpuv_selseq_ops.py
index 5a1154a9..3cf69ff7 100644
--- a/uv_magic_uv/muv_cpuv_selseq_ops.py
+++ b/uv_magic_uv/muv_cpuv_selseq_ops.py
@@ -20,17 +20,17 @@
__author__ = "Nutti <nutti.metro at gmail.com>"
__status__ = "production"
-__version__ = "4.4"
-__date__ = "2 Aug 2017"
+__version__ = "4.5"
+__date__ = "19 Nov 2017"
import bpy
import bmesh
from bpy.props import (
- StringProperty,
- BoolProperty,
- IntProperty,
- EnumProperty,
- )
+ StringProperty,
+ BoolProperty,
+ IntProperty,
+ EnumProperty,
+)
from . import muv_common
@@ -78,11 +78,11 @@ class MUV_CPUVSelSeqCopyUV(bpy.types.Operator):
if isinstance(hist, bmesh.types.BMFace) and hist.select:
uvs = [l[uv_layer].uv.copy() for l in hist.loops]
pin_uvs = [l[uv_layer].pin_uv for l in hist.loops]
- seams = [l.edge.seam for l in hist.loops]
+ seams = [l.edge.seam for l in hist.loops]
props.src_uvs.append(uvs)
props.src_pin_uvs.append(pin_uvs)
props.src_seams.append(seams)
- if len(props.src_uvs) == 0 or len(props.src_pin_uvs) == 0:
+ if not props.src_uvs or not props.src_pin_uvs:
self.report({'WARNING'}, "No faces are selected")
return {'CANCELLED'}
self.report({'INFO'}, "%d face(s) are selected" % len(props.src_uvs))
@@ -152,7 +152,7 @@ class MUV_CPUVSelSeqPasteUV(bpy.types.Operator):
def execute(self, context):
props = context.scene.muv_props.cpuv_selseq
- if len(props.src_uvs) == 0 or len(props.src_pin_uvs) == 0:
+ if not props.src_uvs or not props.src_pin_uvs:
self.report({'WARNING'}, "Need copy UV at first")
return {'CANCELLED'}
if self.uv_map == "":
@@ -192,7 +192,7 @@ class MUV_CPUVSelSeqPasteUV(bpy.types.Operator):
dest_uvs.append(uvs)
dest_pin_uvs.append(pin_uvs)
dest_seams.append(seams)
- if len(dest_uvs) == 0 or len(dest_pin_uvs) == 0:
+ if not dest_uvs or not dest_pin_uvs:
self.report({'WARNING'}, "No faces are selected")
return {'CANCELLED'}
if self.strategy == 'N_N' and len(props.src_uvs) != len(dest_uvs):
@@ -239,7 +239,8 @@ class MUV_CPUVSelSeqPasteUV(bpy.types.Operator):
spuvs_fr.insert(0, pin_uv)
ss_fr.insert(0, s)
# paste UVs
- for l, suv, spuv, ss in zip(bm.faces[idx].loops, suvs_fr, spuvs_fr, ss_fr):
+ for l, suv, spuv, ss in zip(bm.faces[idx].loops, suvs_fr,
+ spuvs_fr, ss_fr):
l[uv_layer].uv = suv
l[uv_layer].pin_uv = spuv
if self.copy_seams is True:
diff --git a/uv_magic_uv/muv_fliprot_ops.py b/uv_magic_uv/muv_fliprot_ops.py
index 7b8b6a7f..334eb14c 100644
--- a/uv_magic_uv/muv_fliprot_ops.py
+++ b/uv_magic_uv/muv_fliprot_ops.py
@@ -20,15 +20,15 @@
__author__ = "Nutti <nutti.metro at gmail.com>"
__status__ = "production"
-__version__ = "4.4"
-__date__ = "2 Aug 2017"
+__version__ = "4.5"
+__date__ = "19 Nov 2017"
import bpy
import bmesh
from bpy.props import (
- BoolProperty,
- IntProperty,
- )
+ BoolProperty,
+ IntProperty,
+)
from . import muv_common
@@ -86,13 +86,14 @@ class MUV_FlipRot(bpy.types.Operator):
dest_uvs.append(uvs)
dest_pin_uvs.append(pin_uvs)
dest_seams.append(seams)
- if len(dest_uvs) == 0 or len(dest_pin_uvs) == 0:
+ if not dest_uvs or not dest_pin_uvs:
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list