diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-11 21:13:07 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-11 21:13:07 +0300 |
| commit | 194cba8ba4aa829c135f891f18679d9a0889a8b9 (patch) | |
| tree | 58f49679bb04b517833136210f6f43dee36a1123 /source/blender/editors/mesh/mesh_ops.c | |
| parent | ef49a587d44a8ab96693d05ab59506f5bfcbd84c (diff) | |
| parent | 925e7758186048857f9483b037b27b0eaf701cce (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/mesh/mesh_ops.c')
| -rw-r--r-- | source/blender/editors/mesh/mesh_ops.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c index dc9cd29a0af..9f3ef6f958d 100644 --- a/source/blender/editors/mesh/mesh_ops.c +++ b/source/blender/editors/mesh/mesh_ops.c @@ -244,16 +244,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); @@ -428,8 +418,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(¯o_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(¯o_ptr, "use_fill", true); + } WM_keymap_add_item(keymap, "MESH_OT_rip_edge_move", DKEY, KM_PRESS, KM_ALT, 0); |