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:
authorlijenstina <lijenstina@gmail.com>2017-04-04 16:48:23 +0300
committerlijenstina <lijenstina@gmail.com>2017-04-04 16:48:23 +0300
commitfa076be65f7de830f5d51bbd1f674ec582175f5a (patch)
tree5ca76f6acf07cdf2e460ac9b1b173d49a8afd042 /mesh_extra_tools
parenteea2de6e7112d34b4d11c04ce6f6fba09138b8fb (diff)
Edit Tools 2: Temporary disable Vertex align for now
Temporary solution for allowing testing and scripts checks vertex_align script needs cleanup and proper merge Until then, disabling calls to it from init
Diffstat (limited to 'mesh_extra_tools')
-rw-r--r--mesh_extra_tools/__init__.py34
1 files changed, 19 insertions, 15 deletions
diff --git a/mesh_extra_tools/__init__.py b/mesh_extra_tools/__init__.py
index d8e8792a..0aa86b37 100644
--- a/mesh_extra_tools/__init__.py
+++ b/mesh_extra_tools/__init__.py
@@ -33,7 +33,7 @@ bl_info = {
"tracker_url": "https://developer.blender.org/maniphest/task/edit/form/2/",
"category": "Mesh"}
-
+# NOTE: Temporarly disable Vertex align since is broken
# Import From Files
if "bpy" in locals():
import importlib
@@ -64,7 +64,7 @@ if "bpy" in locals():
importlib.reload(mesh_info_select)
importlib.reload(mesh_extrude_and_reshape)
importlib.reload(mesh_check)
- importlib.reload(vertex_align)
+ # importlib.reload(vertex_align)
else:
from . import face_inset_fillet
@@ -86,7 +86,7 @@ else:
from . import mesh_help
from . import mesh_extrude_and_reshape
from . import mesh_check
- from . import vertex_align
+ # from . import vertex_align
from .mesh_select_tools import mesh_select_by_direction
from .mesh_select_tools import mesh_select_by_edge_length
@@ -101,7 +101,6 @@ else:
import bpy
import bmesh
-from bpy.props import EnumProperty
from bpy.types import (
Menu,
Panel,
@@ -240,11 +239,15 @@ class EditToolsPanel(Panel):
row.operator("mesh.random_vertices", text="Random Vertices")
row.operator("mesh.extra_tools_help",
icon="LAYER_USED").help_ids = "random_vertices"
+
+ # temporarly disable vertex_align since it is borked
+ """
cen0 = context.scene.va_custom_props.en0
layout = self.layout
+
layout.label(text="Vertex Align:", icon="VERTEXSEL")
layout.prop(context.scene.va_custom_props, 'en0', expand = False)
-
+
if cen0 == 'opt0':
row = layout.split(0.60)
row.label('Store data:')
@@ -264,7 +267,7 @@ class EditToolsPanel(Panel):
row.label('Store data:')
row.operator('va.op1_id', text = 'Face')
layout.operator('va.op6_id', text = 'Align')
-
+ """
# Edge options
box1 = self.layout.box()
col = box1.column(align=True)
@@ -396,25 +399,26 @@ class EditToolsPanel(Panel):
icons = load_icons()
tris = icons.get("triangles")
ngons = icons.get("ngons")
-
-
+
mesh_check = context.window_manager.mesh_check
-
+
layout.prop(mesh_check, "mesh_check_use")
-
+
if mesh_check.mesh_check_use:
layout = self.layout
row = layout.row()
- row.operator("object.face_type_select", text="Tris", icon_value=tris.icon_id).face_type = 'tris'
- row.operator("object.face_type_select", text="Ngons",icon_value=ngons.icon_id).face_type = 'ngons'
+ row.operator("object.face_type_select", text="Tris",
+ icon_value=tris.icon_id).face_type = 'tris'
+ row.operator("object.face_type_select", text="Ngons",
+ icon_value=ngons.icon_id).face_type = 'ngons'
row = layout.row()
row.prop(mesh_check, "display_faces", text="Display Faces")
if mesh_check.display_faces:
row = layout.row()
row.prop(mesh_check, "edge_width")
row = layout.row()
- row.prop(mesh_check, "custom_tri_color",text="Tris color" )
+ row.prop(mesh_check, "custom_tri_color", text="Tris color")
row = layout.row()
row.prop(mesh_check, "custom_ngons_color")
row = layout.row()
@@ -810,7 +814,7 @@ def register():
vfe_specials.register()
mesh_extrude_and_reshape.register()
mesh_check.register()
- vertex_align.register()
+ # vertex_align.register()
bpy.utils.register_module(__name__)
# Register Scene Properties
@@ -835,7 +839,7 @@ def unregister():
vfe_specials.unregister()
mesh_extrude_and_reshape.unregister()
mesh_check.unregister()
- vertex_align.unregister()
+ # vertex_align.unregister()
del bpy.types.Scene.mesh_extra_tools
del bpy.types.Object.tkkey