0.1.81 Performance and Bug Fix Update

- Applying a modifer in edit mode with [modifer key](https://www.notion.so/Extra-de3a011e64b2403a94eeb2d6bc2f12df?pvs=21) (A) is now theoretically up to 1000x faster or more in some situations, but more realistically usually around 2-5x faster. This is with an experimental optimization.
- Unwrap in Place is now up to 10x faster in some cases when heavy modifers are used.

- By optimizing many of the functions, Unwrap in Place on simple meshes with no modifers present should be general faster, from 0.039ms to 0.0265ms and from 2.9s to 1.3s Unwrap in Place is now almost as fast as the regular unwrap on a singel object, 5s vs 4.5s on 63k tris.
- It is now up to 3x faster when unwraping many objects at once.
- Unwrap in Place with uv sync off on many objects (totall 4mil tris) in edit mode whent from 39s to to 4s.
- Fix so that hide state stays the same after an unwrap inplace with uv sync turned off.
- A bug that prevented Unwrap in Place from unwraping an object sometimes correctly is now fixed.
- The active modifer index is now restored after using Unwrap in Place so the active modifer will stay the same.
- Fixed many bugs that was introduced because of 4.1
- New option in fast merge (defualt now) to merge to nearest vert if no activ vert can be found

Author: Dangry98

__init__.py

@@ -18,7 +18,7 @@
 bl_info = {
     "name": "Key Ops: Toolkit",
     "author": "DanGry, MACHIN3",
-    "version": (0, 1, 80),
+    "version": (0, 1, 81),
     "blender": (4, 0, 0),
     "description": "Adds new tools, shortcuts and operations to Blender",
     "category": "3D View"
@@ -97,7 +97,7 @@
     default_classes.append(AutoSmooth)
 
 def register():
-    debug = True
+    debug = False
     global classes, keymaps
     global default_classes
 

addon_preferences.py

@@ -175,7 +175,7 @@ def check_delete_menu_keymap():
             row = column.row()
             row.label(text="Fast Merge")
             row.alignment = 'LEFT'
-            row.prop(self, "fast_merge_last") 
+            row.prop(self, "fast_merge_merge_options")
             row.prop(self, "fast_merge_soft_limit")
             if self.fast_merge_soft_limit == "max_polycount" or self.fast_merge_soft_limit == "max_limit_&_all_selected":
                 row.prop(self, "fast_merge_polycount")
@@ -430,7 +430,7 @@ def update_enable(self, context):
     enable_double_click_select_island: BoolProperty(name="Double Click Select Island", description="Double Click to Select Mesh Island like in Maya", default=True, update=enable_deco("double_click_select_island")) # type: ignore
     enable_smart_seam: BoolProperty(name="Smart seam", default=False, update=enable_deco("smart_seam")) # type: ignore
     enable_uv_tools: BoolProperty(name="UV Tools", default=True, update=enable_deco("uv_tools")) # type: ignore
-    enable_uv_pies: BoolProperty(name="UV Pies", default=False, update=enable_deco("uv_pies")) # type: ignore
+    enable_uv_pies: BoolProperty(name="UV Pies", default=True, update=enable_deco("uv_pies")) # type: ignore
     enable_utility_pie: BoolProperty(name="Utility Pie", default=True, update=enable_deco("utility_pie")) # type: ignore
     enable_add_objects_pie: BoolProperty(name="Add Objects Pie", default=True, update=enable_deco("add_objects_pie")) # type: ignore
     enable_view_camera_pie: BoolProperty(name="View Camera Pie", default=False, update=enable_deco("view_camera_pie")) # type: ignore
@@ -479,7 +479,13 @@ def update_enable(self, context):
             ("HOLD", "Hold", "Hold key to move Pivot")],
         default="HOLD") # type: ignore
     maya_pivot_show_gizmo: BoolProperty(name="Show Gizmo", default=True) # type: ignore
-    fast_merge_last: BoolProperty(name="Always merge nerast", default=False) # type: ignore
+    fast_merge_merge_options: EnumProperty( 
+        name="Options",
+        items=[
+            ("merge to nerest vert if no active", "Merge to nearest if no active and over 1 vert is selected", "Merge to nearest vert if no active vert and over 1 vert is selected"),
+            ("always merge to nearest vert", "Always merge to nearest vert", "Always merge to nearest vert"),
+            ("only merge if active or only 1 verts is selected", "only merge to nearest if 1 vert is selected, otherwise to active vert", "(legacy) only merge if active vert or only 1 verts is selected")],
+        default="merge to nerest vert if no active") # type: ignore
     fast_merge_soft_limit: EnumProperty(
         name="Limit",
         items=[

menu/pies.py

@@ -183,11 +183,11 @@ def draw(self, context):
         # else:
         pie.operator("uv.keyops_quick_pack", text="Quick Pack", icon="CON_SAMEVOL") #BOTTOM
 
-        pie.operator("uv.unwrap", text="Unwrap and Pack", icon="UV_FACESEL") #TOP
+        pie.operator("uv.keyops_unwrap_in_place", text="Unwrap Inplace", icon="STICKY_UVS_VERT") #TOP
 
-        pie.operator("keyops.unwrap_selected", text="Unwrap Selected", icon="UV_VERTEXSEL") #LEFT TOP
+        pie.operator("uv.unwrap", text="Unwrap and Pack", icon="UV_FACESEL") #LEFT TOP
 
-        pie.operator("uv.keyops_unwrap_in_place", text="Unwrap Inplace", icon="STICKY_UVS_VERT") #RIGHT TOP
+        pie.operator("keyops.unwrap_selected", text="Unwrap Selected", icon="UV_VERTEXSEL") #RIGHT TOP
 
         if uvtoolkit and zenuv:
             if bpy.context.tool_settings.use_uv_select_sync:

operators/add_mesh.py

@@ -45,8 +45,8 @@ def draw_scale_prop(self, layout):
 def AddModCylinder(context, segment_amount, scale, use_relative_scale, scale_relative_float, scale_property):
     if bpy.context.mode == 'EDIT_MESH':
         bpy.ops.object.editmode_toggle()
-
-    bpy.ops.mesh.primitive_plane_add(size=2, enter_editmode=True, align='WORLD',  scale=(1, 1, 1))
+    bpy.ops.mesh.primitive_plane_add(size=2, enter_editmode=False, align='WORLD',  scale=(1, 1, 1))    
+    bpy.ops.object.editmode_toggle()
     bpy.ops.mesh.select_mode(use_extend=False, use_expand=False, type='VERT')
     bpy.ops.mesh.edge_collapse()
     bpy.ops.mesh.extrude_region_move(MESH_OT_extrude_region={"use_normal_flip":False, "use_dissolve_ortho_edges":False, "mirror":False}, TRANSFORM_OT_translate={"value":(1, 0, 0),  "orient_type":'GLOBAL', "orient_matrix":((1, 0, 0), (0, 1, 0), (0, 0, 1)), "orient_matrix_type":'GLOBAL', "constraint_axis":(True, False, False), "mirror":False, "use_proportional_edit":False, "proportional_edit_falloff":'SMOOTH', "proportional_size":1, "use_proportional_connected":False, "use_proportional_projected":False, "snap":False, "snap_elements":{'VERTEX'}, "use_snap_project":False, "snap_target":'CLOSEST', "use_snap_self":True, "use_snap_edit":True, "use_snap_nonedit":True, "use_snap_selectable":False, "snap_point":(0, 0, 0), "snap_align":False, "snap_normal":(0, 0, 0),})
@@ -58,7 +58,6 @@ def AddModCylinder(context, segment_amount, scale, use_relative_scale, scale_rel
 
     bpy.ops.object.modifier_add(type='SCREW')
     bpy.context.object.modifiers["Screw"].name = "Cylinder"
-    bpy.ops.object.shade_smooth(use_auto_smooth=True, auto_smooth_angle=1.0472)
     bpy.context.object.modifiers["Cylinder"].use_smooth_shade = True
     bpy.context.object.modifiers["Cylinder"].steps = segment_amount
     bpy.context.object.modifiers["Cylinder"].use_normal_calculate = True
@@ -72,6 +71,8 @@ def AddModCylinder(context, segment_amount, scale, use_relative_scale, scale_rel
     bpy.ops.object.transform_apply(location=False, rotation=False, scale=True)
     bpy.context.object.modifiers["Cylinder"].use_merge_vertices = True
     bpy.context.object.modifiers["Cylinder"].merge_threshold = scale * 0.1
+    if bpy.app.version <= (4, 0, 2):
+        bpy.ops.object.shade_smooth(use_auto_smooth=True, auto_smooth_angle=1.0472)
 
 def AddQuadSphere(context, scale, use_relative_scale, scale_relative_float, scale_property, sub_amount, use_modifiers):
     scale = calculate_scale(context, scale_property, use_relative_scale, scale_relative_float, custom_scale_factor=1.0)
@@ -83,7 +84,7 @@ def AddQuadSphere(context, scale, use_relative_scale, scale_relative_float, scal
     bpy.ops.object.modifier_add(type='CAST')
     bpy.context.object.modifiers["Cast"].factor = 1
     bpy.ops.object.shade_smooth()
-    bpy.ops.transform.resize(value=(1.168, 1.168, 1.168), orient_type='GLOBAL', orient_matrix=((1, 0, 0), (0, 1, 0), (0, 0, 1)), orient_matrix_type='GLOBAL', mirror=False, use_proportional_edit=False, proportional_edit_falloff='SMOOTH', proportional_size=1, use_proportional_connected=False, use_proportional_projected=False, snap=False, snap_elements={'INCREMENT'}, use_snap_project=False, snap_target='CLOSEST', use_snap_self=True, use_snap_edit=True, use_snap_nonedit=True, use_snap_selectable=False, alt_navigation=True)
+    bpy.ops.transform.resize(value=(1.168, 1.168, 1.168), orient_type='GLOBAL', orient_matrix=((1, 0, 0), (0, 1, 0), (0, 0, 1)), orient_matrix_type='GLOBAL', mirror=False, use_proportional_edit=False, proportional_edit_falloff='SMOOTH', proportional_size=1, use_proportional_connected=False, use_proportional_projected=False, snap=False, snap_elements={'INCREMENT'}, use_snap_project=False, snap_target='CLOSEST', use_snap_self=True, use_snap_edit=True, use_snap_nonedit=True, use_snap_selectable=False)
     bpy.ops.object.transform_apply(location=False, rotation=False, scale=True)
 
     if not use_modifiers: 

operators/auto_smooth.py

@@ -129,4 +129,4 @@ def unregister():
 def draw_menu(self, context):
     if context.active_object is not None:
         layout = self.layout
-        layout.operator(AutoSmooth.bl_idname, text="Auto Smooth")
+        layout.operator(AutoSmooth.bl_idname, text="Auto Smooth")

operators/fast_merge.py

@@ -24,9 +24,10 @@ class FastMerge(bpy.types.Operator):
     bl_description = "Fast Merge"
     bl_options = {'REGISTER', 'UNDO'}
 
-    preserve_uvs: bpy.props.BoolProperty(name="Preserve UVs", description="Try Preserve UVs (Slow)", default=False) # type: ignore
+    preserve_uvs: bpy.props.BoolProperty(name="Preserve UVs", description="Try Preserve UVs (Slower and does not always work)", default=False) # type: ignore
     prefs = get_keyops_prefs()
     mouse_position = Vector((0, 0))
+    draw_preserve_uvs = False
 
     @classmethod
     def poll(cls, context):
@@ -38,14 +39,19 @@ def invoke(self, context, event):
         return self.execute(context)
 
     def draw(self, context):
-        if len(self.selected_verts) != 1:
-            self.layout.prop(self, "preserve_uvs")
+        self.layout.prop(self, "preserve_uvs")
 
     def execute(self, context):
         bm = bmesh.from_edit_mesh(context.active_object.data)
         selected_verts = [vert for vert in bm.verts if vert.select]
+
         def merge(self, context, bm=bm, selected_verts=selected_verts):
-            if len(selected_verts) == 1 or self.prefs.fast_merge_last:
+            active_vert = bm.select_history.active
+            if not selected_verts == None:
+                if len(selected_verts) == 0:
+                    self.report({'WARNING'}, "No vertices selected")
+                    return {'FINISHED'}
+            if len(selected_verts) == 1 and self.prefs.fast_merge_merge_options == "only merge if active or only 1 verts is selected" or self.prefs.fast_merge_merge_options == "always merge to nearest vert" or self.prefs.fast_merge_merge_options == "merge to nerest vert if no active" and active_vert == None or len(selected_verts) == 1:
                 obj = context.object
                 matrix_world = obj.matrix_world.copy()
                 bm = bmesh.from_edit_mesh(obj.data)
@@ -76,18 +82,24 @@ def merge(self, context, bm=bm, selected_verts=selected_verts):
                     else:
                         bmesh.ops.pointmerge(bm, verts=selected_verts, merge_co=nearest_vertex.co)
                         bmesh.update_edit_mesh(obj.data)
-
+                        
+                    self.report({'INFO'}, "Merged %d vertices" % (len(selected_verts) - 1))
                 return {'FINISHED'}
-                
+            
             else:
-                selected_history = bm.select_history.active
-                active_edge = selected_history if selected_history in selected_verts else []
+                active_vert = bm.select_history.active
 
-                if active_edge:
+                if active_vert is not None:
                     if self.preserve_uvs:
+                        amount_of_verts_merged = len(selected_verts)
                         bpy.ops.mesh.merge(uvs=True, type='LAST')
                     else:
-                        bpy.ops.mesh.merge(type='LAST')
+                        amount_of_verts_merged = len(selected_verts)
+                        bmesh.ops.pointmerge(bm, verts=selected_verts, merge_co=active_vert.co)
+                        bmesh.update_edit_mesh(context.active_object.data)
+                        
+                    self.report({'INFO'}, "Merged %d vertices" % (amount_of_verts_merged - 1))
+
                 else:
                     self.report({'WARNING'}, "No Active Vertex to Merge to")
 
@@ -97,18 +109,18 @@ def merge(self, context, bm=bm, selected_verts=selected_verts):
             if self.prefs.fast_merge_polycount >= len(selected_verts):
                 merge(self, context, bm, selected_verts)
             else:
-                self.report({'WARNING'}, "Too many vertices selected")
+                self.report({'WARNING'}, "Limit - Too many vertices selected")
         elif self.prefs.fast_merge_soft_limit == "all_selected":
             if len(selected_verts) == len(bm.verts):
-                self.report({'WARNING'}, "All vertices are selected")
+                self.report({'WARNING'}, "Limit - All vertices are selected")
             else:
                 merge(self, context, bm, selected_verts)
         elif self.prefs.fast_merge_soft_limit == "max_limit_&_all_selected":
             if len(selected_verts) == len(bm.verts) and self.prefs.fast_merge_polycount < len(selected_verts):
-                self.report({'WARNING'}, "All vertices are selected")
+                self.report({'WARNING'}, "Limit - All vertices are selected and too many vertices selected")
             elif self.prefs.fast_merge_polycount >= len(selected_verts):
                 merge(self, context, bm, selected_verts)
             else:
-                self.report({'WARNING'}, "Too many vertices selected")
+                self.report({'WARNING'}, "Limit - Too many vertices selected")
 
         return {'FINISHED'}

operators/modi_key.py

@@ -2,6 +2,8 @@
 import bpy.types
 from bpy.types import Context, Operator
 from ..utils.pref_utils import get_is_addon_enabled
+from ..utils.mesh_utils import modifier_toggle_visability_based
+import time
 
 modifier_list = None
 
@@ -59,17 +61,53 @@ def execute(self, context):
                         obj.modifiers.remove(active_modifier)
                         bpy.ops.object.mode_set(mode=current_mode)
                 elif self.type == 'Apply':
+                    name = active_modifier.name
+                    apply_time = time.time()
+
                     if modifier_list:
+                        visibility_modifier_dict_list = {}
+
+                        def modifier_toggle_visability_based2(): 
+                            active_object_name = bpy.context.view_layer.objects.active.name
+
+                            if active_object_name not in visibility_modifier_dict_list:
+                                visibility_modifier_dict_list[active_object_name] = []
+
+                            visibility_modifier_list = visibility_modifier_dict_list[active_object_name]
+
+                            if len(visibility_modifier_list) <= 0:
+                                ml_act_ob = bpy.context.view_layer.objects.active
+                                for mod in ml_act_ob.modifiers:
+                                    if mod.show_viewport:
+                                        visibility_modifier_list.append(mod)
+                                        mod.show_viewport = False
+                            else:
+                                ml_act_ob = bpy.context.view_layer.objects.active
+                                hidden_modifiers = []
+                                for mod in ml_act_ob.modifiers:
+                                    if mod in visibility_modifier_list:
+                                        mod.show_viewport = True
+                                        hidden_modifiers.append(mod)
+                                visibility_modifier_list = [mod for mod in visibility_modifier_list if mod not in hidden_modifiers]
+                                visibility_modifier_dict_list[active_object_name] = visibility_modifier_list
+                                
+                        if bpy.context.mode == 'EDIT_MESH':
+                            modifier_toggle_visability_based2()        
                         bpy.ops.object.ml_modifier_apply("INVOKE_DEFAULT")
+                        if bpy.context.mode == 'EDIT_MESH':
+                            modifier_toggle_visability_based2()   
                     else:
                         if bpy.context.mode == 'OBJECT':
                             bpy.ops.object.modifier_apply(modifier=active_modifier.name)
                         else:
+                            modifier_toggle_visability_based2()        
                             current_mode = bpy.context.object.mode
                             bpy.ops.object.mode_set(mode='OBJECT')
                             bpy.ops.ed.undo_push()
                             bpy.ops.object.modifier_apply(modifier=active_modifier.name)
                             bpy.ops.object.mode_set(mode=current_mode)
+                            modifier_toggle_visability_based2()        
+                    self.report({'INFO'}, f"Applied {name} in {time.time() - apply_time:.3f} seconds")
 
                 elif self.type == 'Apply_All':
                     bpy.ops.object.convert(target='MESH')