Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'uv_magic_uv/op')
-rw-r--r--uv_magic_uv/op/__init__.py4
-rw-r--r--uv_magic_uv/op/align_uv.py33
-rw-r--r--uv_magic_uv/op/align_uv_cursor.py4
-rw-r--r--uv_magic_uv/op/copy_paste_uv.py4
-rw-r--r--uv_magic_uv/op/copy_paste_uv_object.py4
-rw-r--r--uv_magic_uv/op/copy_paste_uv_uvedit.py4
-rw-r--r--uv_magic_uv/op/flip_rotate_uv.py4
-rw-r--r--uv_magic_uv/op/mirror_uv.py4
-rw-r--r--uv_magic_uv/op/move_uv.py4
-rw-r--r--uv_magic_uv/op/pack_uv.py4
-rw-r--r--uv_magic_uv/op/preserve_uv_aspect.py4
-rw-r--r--uv_magic_uv/op/smooth_uv.py4
-rw-r--r--uv_magic_uv/op/texture_lock.py4
-rw-r--r--uv_magic_uv/op/texture_projection.py4
-rw-r--r--uv_magic_uv/op/texture_wrap.py4
-rw-r--r--uv_magic_uv/op/transfer_uv.py4
-rw-r--r--uv_magic_uv/op/unwrap_constraint.py4
-rw-r--r--uv_magic_uv/op/uv_bounding_box.py13
-rw-r--r--uv_magic_uv/op/uv_inspection.py4
-rw-r--r--uv_magic_uv/op/uv_sculpt.py11
-rw-r--r--uv_magic_uv/op/uvw.py4
-rw-r--r--uv_magic_uv/op/world_scale_uv.py4
22 files changed, 59 insertions, 74 deletions
diff --git a/uv_magic_uv/op/__init__.py b/uv_magic_uv/op/__init__.py
index 0b93c96a..75885ef6 100644
--- a/uv_magic_uv/op/__init__.py
+++ b/uv_magic_uv/op/__init__.py
@@ -20,8 +20,8 @@
__author__ = "Nutti <nutti.metro@gmail.com>"
__status__ = "production"
-__version__ = "5.0"
-__date__ = "16 Feb 2018"
+__version__ = "5.1"
+__date__ = "24 Feb 2018"
if "bpy" in locals():
import importlib
diff --git a/uv_magic_uv/op/align_uv.py b/uv_magic_uv/op/align_uv.py
index f90f02ff..dcfb57c3 100644
--- a/uv_magic_uv/op/align_uv.py
+++ b/uv_magic_uv/op/align_uv.py
@@ -20,8 +20,8 @@
__author__ = "imdjs, Nutti <nutti.metro@gmail.com>"
__status__ = "production"
-__version__ = "5.0"
-__date__ = "16 Feb 2018"
+__version__ = "5.1"
+__date__ = "24 Feb 2018"
import math
from math import atan2, tan, sin, cos
@@ -34,33 +34,6 @@ from bpy.props import EnumProperty, BoolProperty
from .. import common
-def get_closed_loop_sequences(bm, uv_layer):
- sel_faces = [f for f in bm.faces if f.select]
-
- # get candidate loops
- cand_loops = []
- for f in sel_faces:
- for l in f.loops:
- if l[uv_layer].select:
- cand_loops.append(l)
-
- if len(cand_loops) < 2:
- return None, "More than 2 UVs must be selected"
-
- first_loop = cand_loops[0]
- isl_info = common.get_island_info_from_bmesh(bm, False)
- loop_pairs = common.get_loop_pairs(first_loop, uv_layer)
- loop_pairs, err = common.sort_loop_pairs(uv_layer, loop_pairs, True)
- if not loop_pairs:
- return None, err
- loop_seqs, err = common.get_loop_sequence_internal(uv_layer, loop_pairs,
- isl_info, True)
- if not loop_seqs:
- return None, err
-
- return loop_seqs, ""
-
-
# get sum vertex length of loop sequences
def get_loop_vert_len(loops):
length = 0
@@ -143,7 +116,7 @@ class MUV_AUVCircle(bpy.types.Operator):
uv_layer = bm.loops.layers.uv.verify()
# loop_seqs[horizontal][vertical][loop]
- loop_seqs, error = get_closed_loop_sequences(bm, uv_layer)
+ loop_seqs, error = common.get_loop_sequences(bm, uv_layer, True)
if not loop_seqs:
self.report({'WARNING'}, error)
return {'CANCELLED'}
diff --git a/uv_magic_uv/op/align_uv_cursor.py b/uv_magic_uv/op/align_uv_cursor.py
index b33dc68e..cae1c89a 100644
--- a/uv_magic_uv/op/align_uv_cursor.py
+++ b/uv_magic_uv/op/align_uv_cursor.py
@@ -20,8 +20,8 @@
__author__ = "Nutti <nutti.metro@gmail.com>"
__status__ = "production"
-__version__ = "5.0"
-__date__ = "16 Feb 2018"
+__version__ = "5.1"
+__date__ = "24 Feb 2018"
import bpy
from mathutils import Vector
diff --git a/uv_magic_uv/op/copy_paste_uv.py b/uv_magic_uv/op/copy_paste_uv.py
index 3aac3f6d..ee89b5e9 100644
--- a/uv_magic_uv/op/copy_paste_uv.py
+++ b/uv_magic_uv/op/copy_paste_uv.py
@@ -20,8 +20,8 @@
__author__ = "imdjs, Nutti <nutti.metro@gmail.com>"
__status__ = "production"
-__version__ = "5.0"
-__date__ = "16 Feb 2018"
+__version__ = "5.1"
+__date__ = "24 Feb 2018"
import math
from math import atan2, sin, cos
diff --git a/uv_magic_uv/op/copy_paste_uv_object.py b/uv_magic_uv/op/copy_paste_uv_object.py
index eb42d99a..d80ee415 100644
--- a/uv_magic_uv/op/copy_paste_uv_object.py
+++ b/uv_magic_uv/op/copy_paste_uv_object.py
@@ -20,8 +20,8 @@
__author__ = "Nutti <nutti.metro@gmail.com>"
__status__ = "production"
-__version__ = "5.0"
-__date__ = "16 Feb 2018"
+__version__ = "5.1"
+__date__ = "24 Feb 2018"
import bpy
import bmesh
diff --git a/uv_magic_uv/op/copy_paste_uv_uvedit.py b/uv_magic_uv/op/copy_paste_uv_uvedit.py
index 5b64505e..96908020 100644
--- a/uv_magic_uv/op/copy_paste_uv_uvedit.py
+++ b/uv_magic_uv/op/copy_paste_uv_uvedit.py
@@ -20,8 +20,8 @@
__author__ = "Nutti <nutti.metro@gmail.com>, Jace Priester"
__status__ = "production"
-__version__ = "5.0"
-__date__ = "16 Feb 2018"
+__version__ = "5.1"
+__date__ = "24 Feb 2018"
import math
from math import atan2, sin, cos
diff --git a/uv_magic_uv/op/flip_rotate_uv.py b/uv_magic_uv/op/flip_rotate_uv.py
index 907c77c4..30f6b0f7 100644
--- a/uv_magic_uv/op/flip_rotate_uv.py
+++ b/uv_magic_uv/op/flip_rotate_uv.py
@@ -20,8 +20,8 @@
__author__ = "Nutti <nutti.metro@gmail.com>"
__status__ = "production"
-__version__ = "5.0"
-__date__ = "16 Feb 2018"
+__version__ = "5.1"
+__date__ = "24 Feb 2018"
import bpy
import bmesh
diff --git a/uv_magic_uv/op/mirror_uv.py b/uv_magic_uv/op/mirror_uv.py
index d1014c73..f4849d18 100644
--- a/uv_magic_uv/op/mirror_uv.py
+++ b/uv_magic_uv/op/mirror_uv.py
@@ -20,8 +20,8 @@
__author__ = "Keith (Wahooney) Boshoff, Nutti <nutti.metro@gmail.com>"
__status__ = "production"
-__version__ = "5.0"
-__date__ = "16 Feb 2018"
+__version__ = "5.1"
+__date__ = "24 Feb 2018"
import bpy
from bpy.props import (
diff --git a/uv_magic_uv/op/move_uv.py b/uv_magic_uv/op/move_uv.py
index e0ac418f..6382376c 100644
--- a/uv_magic_uv/op/move_uv.py
+++ b/uv_magic_uv/op/move_uv.py
@@ -20,8 +20,8 @@
__author__ = "kgeogeo, mem, Nutti <nutti.metro@gmail.com>"
__status__ = "production"
-__version__ = "5.0"
-__date__ = "16 Feb 2018"
+__version__ = "5.1"
+__date__ = "24 Feb 2018"
import bpy
import bmesh
diff --git a/uv_magic_uv/op/pack_uv.py b/uv_magic_uv/op/pack_uv.py
index 692fa93e..a780af3e 100644
--- a/uv_magic_uv/op/pack_uv.py
+++ b/uv_magic_uv/op/pack_uv.py
@@ -20,8 +20,8 @@
__author__ = "Nutti <nutti.metro@gmail.com>"
__status__ = "production"
-__version__ = "5.0"
-__date__ = "16 Feb 2018"
+__version__ = "5.1"
+__date__ = "24 Feb 2018"
from math import fabs
diff --git a/uv_magic_uv/op/preserve_uv_aspect.py b/uv_magic_uv/op/preserve_uv_aspect.py
index 9838aec6..bc2f1b81 100644
--- a/uv_magic_uv/op/preserve_uv_aspect.py
+++ b/uv_magic_uv/op/preserve_uv_aspect.py
@@ -20,8 +20,8 @@
__author__ = "Nutti <nutti.metro@gmail.com>"
__status__ = "production"
-__version__ = "5.0"
-__date__ = "16 Feb 2018"
+__version__ = "5.1"
+__date__ = "24 Feb 2018"
import bpy
import bmesh
diff --git a/uv_magic_uv/op/smooth_uv.py b/uv_magic_uv/op/smooth_uv.py
index 6a120d08..aa9b22c0 100644
--- a/uv_magic_uv/op/smooth_uv.py
+++ b/uv_magic_uv/op/smooth_uv.py
@@ -20,8 +20,8 @@
__author__ = "imdjs, Nutti <nutti.metro@gmail.com>"
__status__ = "production"
-__version__ = "5.0"
-__date__ = "16 Feb 2018"
+__version__ = "5.1"
+__date__ = "24 Feb 2018"
import bpy
import bmesh
diff --git a/uv_magic_uv/op/texture_lock.py b/uv_magic_uv/op/texture_lock.py
index b0be3534..d6c56f5a 100644
--- a/uv_magic_uv/op/texture_lock.py
+++ b/uv_magic_uv/op/texture_lock.py
@@ -20,8 +20,8 @@
__author__ = "Nutti <nutti.metro@gmail.com>"
__status__ = "production"
-__version__ = "5.0"
-__date__ = "16 Feb 2018"
+__version__ = "5.1"
+__date__ = "24 Feb 2018"
import math
from math import atan2, cos, sqrt, sin, fabs
diff --git a/uv_magic_uv/op/texture_projection.py b/uv_magic_uv/op/texture_projection.py
index 9c2dc521..77a81aa0 100644
--- a/uv_magic_uv/op/texture_projection.py
+++ b/uv_magic_uv/op/texture_projection.py
@@ -20,8 +20,8 @@
__author__ = "Nutti <nutti.metro@gmail.com>"
__status__ = "production"
-__version__ = "5.0"
-__date__ = "16 Feb 2018"
+__version__ = "5.1"
+__date__ = "24 Feb 2018"
from collections import namedtuple
diff --git a/uv_magic_uv/op/texture_wrap.py b/uv_magic_uv/op/texture_wrap.py
index 91b06704..01e507bd 100644
--- a/uv_magic_uv/op/texture_wrap.py
+++ b/uv_magic_uv/op/texture_wrap.py
@@ -20,8 +20,8 @@
__author__ = "Nutti <nutti.metro@gmail.com>"
__status__ = "production"
-__version__ = "5.0"
-__date__ = "16 Feb 2018"
+__version__ = "5.1"
+__date__ = "24 Feb 2018"
import bpy
import bmesh
diff --git a/uv_magic_uv/op/transfer_uv.py b/uv_magic_uv/op/transfer_uv.py
index fd1b45e4..132f395e 100644
--- a/uv_magic_uv/op/transfer_uv.py
+++ b/uv_magic_uv/op/transfer_uv.py
@@ -20,8 +20,8 @@
__author__ = "Nutti <nutti.metro@gmail.com>, Mifth, MaxRobinot"
__status__ = "production"
-__version__ = "5.0"
-__date__ = "16 Feb 2018"
+__version__ = "5.1"
+__date__ = "24 Feb 2018"
from collections import OrderedDict
diff --git a/uv_magic_uv/op/unwrap_constraint.py b/uv_magic_uv/op/unwrap_constraint.py
index 311b2c35..e98879b7 100644
--- a/uv_magic_uv/op/unwrap_constraint.py
+++ b/uv_magic_uv/op/unwrap_constraint.py
@@ -18,8 +18,8 @@
__author__ = "Nutti <nutti.metro@gmail.com>"
__status__ = "production"
-__version__ = "5.0"
-__date__ = "16 Feb 2018"
+__version__ = "5.1"
+__date__ = "24 Feb 2018"
import bpy
import bmesh
diff --git a/uv_magic_uv/op/uv_bounding_box.py b/uv_magic_uv/op/uv_bounding_box.py
index 04aa6110..9ebc76c4 100644
--- a/uv_magic_uv/op/uv_bounding_box.py
+++ b/uv_magic_uv/op/uv_bounding_box.py
@@ -20,8 +20,8 @@
__author__ = "Nutti <nutti.metro@gmail.com>"
__status__ = "production"
-__version__ = "5.0"
-__date__ = "16 Feb 2018"
+__version__ = "5.1"
+__date__ = "24 Feb 2018"
from enum import IntEnum
import math
@@ -693,6 +693,13 @@ class MUV_UVBBUpdater(bpy.types.Operator):
if props.running is False:
self.__handle_remove(context)
return {'FINISHED'}
+
+ area, _, _ = common.get_space('VIEW_3D', 'WINDOW', 'VIEW_3D')
+
+ if event.mouse_region_x < 0 or event.mouse_region_x > area.width or \
+ event.mouse_region_y < 0 or event.mouse_region_y > area.height:
+ return {'PASS_THROUGH'}
+
if event.type == 'TIMER':
trans_mat = self.__cmd_exec.execute()
self.__update_uvs(context, props.uv_info_ini, trans_mat)
@@ -701,7 +708,7 @@ class MUV_UVBBUpdater(bpy.types.Operator):
self.__state_mgr.update(context, props.ctrl_points, event)
- return {'PASS_THROUGH'}
+ return {'RUNNING_MODAL'}
def execute(self, context):
props = context.scene.muv_props.uvbb
diff --git a/uv_magic_uv/op/uv_inspection.py b/uv_magic_uv/op/uv_inspection.py
index 0e8778f3..60a754a3 100644
--- a/uv_magic_uv/op/uv_inspection.py
+++ b/uv_magic_uv/op/uv_inspection.py
@@ -20,8 +20,8 @@
__author__ = "Nutti <nutti.metro@gmail.com>"
__status__ = "production"
-__version__ = "5.0"
-__date__ = "16 Feb 2018"
+__version__ = "5.1"
+__date__ = "24 Feb 2018"
import bpy
import bmesh
diff --git a/uv_magic_uv/op/uv_sculpt.py b/uv_magic_uv/op/uv_sculpt.py
index 6133b2a2..2bf76abd 100644
--- a/uv_magic_uv/op/uv_sculpt.py
+++ b/uv_magic_uv/op/uv_sculpt.py
@@ -20,8 +20,8 @@
__author__ = "Nutti <nutti.metro@gmail.com>"
__status__ = "production"
-__version__ = "5.0"
-__date__ = "16 Feb 2018"
+__version__ = "5.1"
+__date__ = "24 Feb 2018"
from math import pi, cos, tan, sin
@@ -316,6 +316,11 @@ class MUV_UVSculptOps(bpy.types.Operator):
return {'FINISHED'}
self.current_mco = Vector((event.mouse_region_x, event.mouse_region_y))
+ area, _, _ = common.get_space('VIEW_3D', 'WINDOW', 'VIEW_3D')
+
+ if self.current_mco.x < 0 or self.current_mco.x > area.width or \
+ self.current_mco.y < 0 or self.current_mco.y > area.height:
+ return {'PASS_THROUGH'}
if event.type == 'LEFTMOUSE':
if event.value == 'PRESS':
@@ -333,7 +338,7 @@ class MUV_UVSculptOps(bpy.types.Operator):
if self.__stroking:
self.__stroke_apply(context, event)
- return {'PASS_THROUGH'}
+ return {'RUNNING_MODAL'}
def invoke(self, context, _):
props = context.scene.muv_props.uvsculpt
diff --git a/uv_magic_uv/op/uvw.py b/uv_magic_uv/op/uvw.py
index 37d88a53..10202677 100644
--- a/uv_magic_uv/op/uvw.py
+++ b/uv_magic_uv/op/uvw.py
@@ -20,8 +20,8 @@
__author__ = "Alexander Milovsky, Nutti <nutti.metro@gmail.com>"
__status__ = "production"
-__version__ = "5.0"
-__date__ = "16 Feb 2018"
+__version__ = "5.1"
+__date__ = "24 Feb 2018"
from math import sin, cos, pi
diff --git a/uv_magic_uv/op/world_scale_uv.py b/uv_magic_uv/op/world_scale_uv.py
index f1539ddb..e256fbac 100644
--- a/uv_magic_uv/op/world_scale_uv.py
+++ b/uv_magic_uv/op/world_scale_uv.py
@@ -20,8 +20,8 @@
__author__ = "McBuff, Nutti <nutti.metro@gmail.com>"
__status__ = "production"
-__version__ = "5.0"
-__date__ = "16 Feb 2018"
+__version__ = "5.1"
+__date__ = "24 Feb 2018"
from math import sqrt