[Bf-extensions-cvs] [6d5d8e18] master: mesh tools: merge mesh relax: T71560

[meta-androcto]

Commit: 6d5d8e187d913bbe4a477b063678c36eb50f1ce7
Author: meta-androcto
Date:   Mon Dec 2 12:43:30 2019 +1100
Branches: master
https://developer.blender.org/rBA6d5d8e187d913bbe4a477b063678c36eb50f1ce7

mesh tools: merge mesh relax: T71560

===================================================================

M	mesh_tools/__init__.py
R100	mesh_relax.py	mesh_tools/mesh_relax.py

===================================================================

diff --git a/mesh_tools/__init__.py b/mesh_tools/__init__.py
index 13238e50..9a1147b6 100644
--- a/mesh_tools/__init__.py
+++ b/mesh_tools/__init__.py
@@ -49,6 +49,7 @@ if "bpy" in locals():
     importlib.reload(mesh_edges_length)
     importlib.reload(pkhg_faces)
     importlib.reload(mesh_cut_faces)
+    importlib.reload(mesh_relax)
 
 else:
     from . import mesh_offset_edges
@@ -63,6 +64,7 @@ else:
     from . import mesh_edges_length
     from . import pkhg_faces
     from . import mesh_cut_faces
+    from . import mesh_relax
 
 
 import bmesh
@@ -1013,6 +1015,8 @@ class VIEW3D_PT_edit_mesh_tools(Panel):
             props.quad_method = props.ngon_method = 'BEAUTY'
             row = col_top.row(align=True)
             row.operator("mesh.tris_convert_to_quads")
+            row = col_top.row(align=True)
+            row.operator("mesh.relax")
             
 # property group containing all properties for the gui in the panel
 class EditToolsProps(PropertyGroup):
@@ -1134,6 +1138,7 @@ def register():
     mesh_edges_length.register()
     pkhg_faces.register()
     mesh_cut_faces.register()
+    mesh_relax.register()
 
 
 # unregistering and removing menus
@@ -1159,6 +1164,7 @@ def unregister():
     mesh_edges_length.unregister()
     pkhg_faces.unregister()
     mesh_cut_faces.unregister()
+    mesh_relax.unregister()
 
 
 if __name__ == "__main__":
diff --git a/mesh_relax.py b/mesh_tools/mesh_relax.py
similarity index 100%
rename from mesh_relax.py
rename to mesh_tools/mesh_relax.py