[Bf-extensions-cvs] [48c4cad2] master: Magic UV: Fix error and cleanup codes
Nutti
noreply at git.blender.org
Sun Jan 20 14:46:23 CET 2019
Commit: 48c4cad2c4211c52f71f5ab39b94538608ecd90e
Author: Nutti
Date: Sun Jan 20 22:45:34 2019 +0900
Branches: master
https://developer.blender.org/rBA48c4cad2c4211c52f71f5ab39b94538608ecd90e
Magic UV: Fix error and cleanup codes
===================================================================
M uv_magic_uv/__init__.py
M uv_magic_uv/common.py
M uv_magic_uv/lib/bglx.py
M uv_magic_uv/op/align_uv.py
M uv_magic_uv/op/align_uv_cursor.py
M uv_magic_uv/op/copy_paste_uv.py
M uv_magic_uv/op/copy_paste_uv_object.py
M uv_magic_uv/op/copy_paste_uv_uvedit.py
M uv_magic_uv/op/flip_rotate_uv.py
M uv_magic_uv/op/mirror_uv.py
M uv_magic_uv/op/move_uv.py
M uv_magic_uv/op/pack_uv.py
M uv_magic_uv/op/preserve_uv_aspect.py
M uv_magic_uv/op/select_uv.py
M uv_magic_uv/op/smooth_uv.py
M uv_magic_uv/op/texture_lock.py
M uv_magic_uv/op/texture_projection.py
M uv_magic_uv/op/texture_wrap.py
M uv_magic_uv/op/transfer_uv.py
M uv_magic_uv/op/unwrap_constraint.py
M uv_magic_uv/op/uv_bounding_box.py
M uv_magic_uv/op/uv_inspection.py
M uv_magic_uv/op/uv_sculpt.py
M uv_magic_uv/op/uvw.py
M uv_magic_uv/op/world_scale_uv.py
M uv_magic_uv/preferences.py
M uv_magic_uv/properites.py
M uv_magic_uv/ui/IMAGE_MT_uvs.py
M uv_magic_uv/ui/VIEW3D_MT_object.py
M uv_magic_uv/ui/VIEW3D_MT_uv_map.py
M uv_magic_uv/ui/uvedit_copy_paste_uv.py
M uv_magic_uv/ui/uvedit_editor_enhancement.py
M uv_magic_uv/ui/view3d_copy_paste_uv_editmode.py
M uv_magic_uv/ui/view3d_copy_paste_uv_objectmode.py
M uv_magic_uv/ui/view3d_uv_mapping.py
A uv_magic_uv/updater.py
M uv_magic_uv/utils/addon_updator.py
===================================================================
diff --git a/uv_magic_uv/__init__.py b/uv_magic_uv/__init__.py
index ae0317ed..094c7989 100644
--- a/uv_magic_uv/__init__.py
+++ b/uv_magic_uv/__init__.py
@@ -51,6 +51,7 @@ if "bpy" in locals():
importlib.reload(ui)
importlib.reload(properites)
importlib.reload(preferences)
+ importlib.reload(updater)
else:
import bpy
from . import common
@@ -59,36 +60,24 @@ else:
from . import ui
from . import properites
from . import preferences
-
-import os
+ from . import updater
import bpy
-def register_updater(bl_info):
- config = utils.addon_updator.AddonUpdatorConfig()
- config.owner = "nutti"
- config.repository = "Magic-UV"
- config.current_addon_path = os.path.dirname(os.path.realpath(__file__))
- config.branches = ["master", "develop"]
- config.addon_directory = config.current_addon_path[:config.current_addon_path.rfind("/")]
- config.min_release_version = bl_info["version"]
- config.target_addon_path = "src/uv_magic_uv"
- updater = utils.addon_updator.AddonUpdatorManager.get_instance()
- updater.init(bl_info, config)
-
-
def register():
- register_updater(bl_info)
+ updater.register_updater(bl_info)
utils.bl_class_registry.BlClassRegistry.register()
properites.init_props(bpy.types.Scene)
- if utils.compatibility.get_user_preferences(bpy.context).addons['uv_magic_uv'].preferences.enable_builtin_menu:
+ user_prefs = utils.compatibility.get_user_preferences(bpy.context)
+ if user_prefs.addons['uv_magic_uv'].preferences.enable_builtin_menu:
preferences.add_builtin_menu()
def unregister():
- if utils.compatibility.get_user_preferences(bpy.context).addons['uv_magic_uv'].preferences.enable_builtin_menu:
+ user_prefs = utils.compatibility.get_user_preferences(bpy.context)
+ if user_prefs.addons['uv_magic_uv'].preferences.enable_builtin_menu:
preferences.remove_builtin_menu()
properites.clear_props(bpy.types.Scene)
utils.bl_class_registry.BlClassRegistry.unregister()
diff --git a/uv_magic_uv/common.py b/uv_magic_uv/common.py
index 961ce447..5e4fd486 100644
--- a/uv_magic_uv/common.py
+++ b/uv_magic_uv/common.py
@@ -409,7 +409,8 @@ def find_image(obj, face=None, tex_layer=None):
nodes = find_texture_nodes(obj)
if len(nodes) >= 2:
raise RuntimeError("Find more than 2 texture nodes")
- img = nodes[0].image
+ if len(nodes) == 1:
+ img = nodes[0].image
return img
diff --git a/uv_magic_uv/lib/bglx.py b/uv_magic_uv/lib/bglx.py
index 72e030fa..5abde12c 100644
--- a/uv_magic_uv/lib/bglx.py
+++ b/uv_magic_uv/lib/bglx.py
@@ -235,6 +235,12 @@ GL_SCISSOR_BOX = bgl.GL_SCISSOR_BOX
GL_TEXTURE_2D = bgl.GL_TEXTURE_2D
GL_TEXTURE0 = bgl.GL_TEXTURE0
+GL_TEXTURE_MIN_FILTER = 0
+GL_TEXTURE_MAG_FILTER = 0
+GL_LINEAR = 0
+GL_TEXTURE_ENV = 0
+GL_TEXTURE_ENV_MODE = 0
+GL_MODULATE = 0
def glEnable(cap):
bgl.glEnable(cap)
@@ -258,3 +264,12 @@ def glActiveTexture(texture):
def glBindTexture(target, texture):
bgl.glBindTexture(target, texture)
+
+
+def glTexParameteri(target, pname, param):
+ pass
+
+
+def glTexEnvi(target, pname, param):
+ pass
+
diff --git a/uv_magic_uv/op/align_uv.py b/uv_magic_uv/op/align_uv.py
index 5420c33f..3b0fa221 100644
--- a/uv_magic_uv/op/align_uv.py
+++ b/uv_magic_uv/op/align_uv.py
@@ -296,41 +296,41 @@ class _Properties:
@classmethod
def init_props(cls, scene):
- scene.muv_align_uv_enabled: BoolProperty(
+ scene.muv_align_uv_enabled = BoolProperty(
name="Align UV Enabled",
description="Align UV is enabled",
default=False
)
- scene.muv_align_uv_transmission: BoolProperty(
+ scene.muv_align_uv_transmission = BoolProperty(
name="Transmission",
description="Align linked UVs",
default=False
)
- scene.muv_align_uv_select: BoolProperty(
+ scene.muv_align_uv_select = BoolProperty(
name="Select",
description="Select UVs which are aligned",
default=False
)
- scene.muv_align_uv_vertical: BoolProperty(
+ scene.muv_align_uv_vertical = BoolProperty(
name="Vert-Infl (Vertical)",
description="Align vertical direction influenced "
"by mesh vertex proportion",
default=False
)
- scene.muv_align_uv_horizontal: BoolProperty(
+ scene.muv_align_uv_horizontal = BoolProperty(
name="Vert-Infl (Horizontal)",
description="Align horizontal direction influenced "
"by mesh vertex proportion",
default=False
)
- scene.muv_align_uv_mesh_infl: FloatProperty(
+ scene.muv_align_uv_mesh_infl = FloatProperty(
name="Mesh Influence",
description="Influence rate of mesh vertex",
min=0.0,
max=1.0,
default=0.0
)
- scene.muv_align_uv_location: EnumProperty(
+ scene.muv_align_uv_location = EnumProperty(
name="Location",
description="Align location",
items=[
@@ -356,17 +356,17 @@ class _Properties:
@compat.make_annotations
class MUV_OT_AlignUV_Circle(bpy.types.Operator):
- bl_idname = "uv.muv_align_uv_operator_circle"
+ bl_idname = "uv.muv_ot_align_uv_circle"
bl_label = "Align UV (Circle)"
bl_description = "Align UV coordinates to Circle"
bl_options = {'REGISTER', 'UNDO'}
- transmission: BoolProperty(
+ transmission = BoolProperty(
name="Transmission",
description="Align linked UVs",
default=False
)
- select: BoolProperty(
+ select = BoolProperty(
name="Select",
description="Select UVs which are aligned",
default=False
@@ -442,34 +442,34 @@ class MUV_OT_AlignUV_Circle(bpy.types.Operator):
@compat.make_annotations
class MUV_OT_AlignUV_Straighten(bpy.types.Operator):
- bl_idname = "uv.muv_align_uv_operator_straighten"
+ bl_idname = "uv.muv_ot_align_uv_straighten"
bl_label = "Align UV (Straighten)"
bl_description = "Straighten UV coordinates"
bl_options = {'REGISTER', 'UNDO'}
- transmission: BoolProperty(
+ transmission = BoolProperty(
name="Transmission",
description="Align linked UVs",
default=False
)
- select: BoolProperty(
+ select = BoolProperty(
name="Select",
description="Select UVs which are aligned",
default=False
)
- vertical: BoolProperty(
+ vertical = BoolProperty(
name="Vert-Infl (Vertical)",
description="Align vertical direction influenced "
"by mesh vertex proportion",
default=False
)
- horizontal: BoolProperty(
+ horizontal = BoolProperty(
name="Vert-Infl (Horizontal)",
description="Align horizontal direction influenced "
"by mesh vertex proportion",
default=False
)
- mesh_infl: FloatProperty(
+ mesh_infl = FloatProperty(
name="Mesh Influence",
description="Influence rate of mesh vertex",
min=0.0,
@@ -594,34 +594,34 @@ class MUV_OT_AlignUV_Straighten(bpy.types.Operator):
@compat.make_annotations
class MUV_OT_AlignUV_Axis(bpy.types.Operator):
- bl_idname = "uv.muv_align_uv_operator_axis"
+ bl_idname = "uv.muv_ot_align_uv_axis"
bl_label = "Align UV (XY-Axis)"
bl_description = "Align UV to XY-axis"
bl_options = {'REGISTER', 'UNDO'}
- transmission: BoolProperty(
+ transmission = BoolProperty(
name="Transmission",
description="Align linked UVs",
default=False
)
- select: BoolProperty(
+ select = BoolProperty(
name="Select",
description="Select UVs which are aligned",
default=False
)
- vertical: BoolProperty(
+ vertical = BoolProperty(
name="Vert-Infl (Vertical)",
description="Align vertical direction influenced "
"by mesh vertex proportion",
default=False
)
- horizontal: BoolProperty(
+ horizontal = BoolProperty(
name="Vert-Infl (Horizontal)",
description="Align horizontal direction influenced "
"by mesh vertex proportion",
default=False
)
- location: EnumProperty(
+ location = EnumProperty(
name="Location",
description="Align location",
items=[
@@ -631,7 +631,7 @@ class MUV_OT_AlignUV_Axis(bpy.types.Operator):
],
default='MIDDLE'
)
- mesh_infl: FloatProperty(
+ mesh_infl = FloatProperty(
name="Mesh Influence",
description="Influence rate of mesh vertex",
min=0.0,
diff --git a/uv_magic_uv/op/align_uv_cursor.py b/uv_magic_uv/op/align_uv_cursor.py
index bd92cf81..326814eb 100644
--- a/uv_magic_uv/op/align_uv_cursor.py
+++ b/uv_magic_uv/op/align_uv_cursor.py
@@ -86,13 +86,13 @@ class _Properties:
cy = bd_size[1] * value[1]
space.cursor_location = Vector((cx, cy))
- scene.muv_align_uv_cursor_enabled: BoolProperty(
+ scene.muv_align_uv_cursor_enabled = BoolProperty(
name="Align UV Cursor Enabled",
description="Align UV Cursor is enabled",
default=False
)
- scene.muv_align_uv_cursor_cursor_loc: FloatVectorProperty(
+ scene.muv_align_uv_cursor_cursor_loc = FloatVectorProperty(
name="UV Cursor Location",
size=2,
precision=4,
@@ -103,7 +103,7 @@ class _Properties:
get=auvc_get_cursor_loc,
set=auvc_set_cursor_loc
)
- scene.muv_align_uv_cursor_align_method: EnumProperty(
+ scene.muv_align_uv_cursor_align_method = EnumProperty(
name="Align Method",
description="Align Method",
default='TEXTURE',
@@ -114,7 +114,7 @@ class _Properties:
]
)
- scene.muv_uv_cursor_location_enabled: BoolProperty(
+ scene.muv_uv_cursor_location_enabled = BoolProperty(
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list