EditMesh: remove duplicate rip macro
authorCampbell Barton <ideasman42@gmail.com>
Fri, 11 May 2018 18:02:12 +0000 (20:02 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 11 May 2018 18:02:12 +0000 (20:02 +0200)
Change the fill setting in the keymap,
this allows tool access the macro with either setting.

release/scripts/startup/bl_ui/space_view3d.py
source/blender/editors/mesh/mesh_ops.c

index a618ef7fd4e2af8a6d32f9d2b38bec28f19a074f..6334a2ee87ec99d0cd286050f98e5ec0800eab5c 100644 (file)
@@ -2630,8 +2630,10 @@ class VIEW3D_MT_edit_mesh_vertices(Menu):
 
         layout.operator("mesh.merge")
         layout.operator("mesh.remove_doubles")
-        layout.operator("mesh.rip_move")
-        layout.operator("mesh.rip_move_fill")
+        props = layout.operator("mesh.rip_move")
+        props.MESH_OT_rip.use_fill = False
+        props = layout.operator("mesh.rip_move", text="Rip Fill")
+        props.MESH_OT_rip.use_fill = True
         layout.operator("mesh.rip_edge_move")
         layout.operator("mesh.split")
         layout.operator_menu_enum("mesh.separate", "type")
index 697a92f36d10612ac013766708c42080077eb7da..daf0b51f594bf213871cad4910863030aa8cc89c 100644 (file)
@@ -243,16 +243,6 @@ void ED_operatormacros_mesh(void)
        ot = WM_operatortype_append_macro("MESH_OT_rip_move", "Rip", "Rip polygons and move the result",
                                          OPTYPE_UNDO | OPTYPE_REGISTER);
        otmacro = WM_operatortype_macro_define(ot, "MESH_OT_rip");
-       RNA_boolean_set(otmacro->ptr, "use_fill", false);
-       otmacro = WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
-       RNA_enum_set(otmacro->ptr, "proportional", 0);
-       RNA_boolean_set(otmacro->ptr, "mirror", false);
-
-       /* annoying we can't pass 'use_fill' through the macro */
-       ot = WM_operatortype_append_macro("MESH_OT_rip_move_fill", "Rip Fill", "Rip-fill polygons and move the result",
-                                         OPTYPE_UNDO | OPTYPE_REGISTER);
-       otmacro = WM_operatortype_macro_define(ot, "MESH_OT_rip");
-       RNA_boolean_set(otmacro->ptr, "use_fill", true);
        otmacro = WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
        RNA_enum_set(otmacro->ptr, "proportional", 0);
        RNA_boolean_set(otmacro->ptr, "mirror", false);
@@ -403,8 +393,16 @@ void ED_keymap_mesh(wmKeyConfig *keyconf)
 
        WM_keymap_add_item(keymap, "MESH_OT_tris_convert_to_quads", JKEY, KM_PRESS, KM_ALT, 0);
 
-       WM_keymap_add_item(keymap, "MESH_OT_rip_move", VKEY, KM_PRESS, 0, 0);
-       WM_keymap_add_item(keymap, "MESH_OT_rip_move_fill", VKEY, KM_PRESS, KM_ALT, 0);
+       kmi = WM_keymap_add_item(keymap, "MESH_OT_rip_move", VKEY, KM_PRESS, 0, 0);
+       {
+               PointerRNA macro_ptr = RNA_pointer_get(kmi->ptr, "MESH_OT_rip");
+               RNA_boolean_set(&macro_ptr, "use_fill", false);
+       }
+       kmi = WM_keymap_add_item(keymap, "MESH_OT_rip_move", VKEY, KM_PRESS, KM_ALT, 0);
+       {
+               PointerRNA macro_ptr = RNA_pointer_get(kmi->ptr, "MESH_OT_rip");
+               RNA_boolean_set(&macro_ptr, "use_fill", true);
+       }
 
        WM_keymap_add_item(keymap, "MESH_OT_rip_edge_move", DKEY, KM_PRESS, KM_ALT, 0);