griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix [#21542] Clear origin shortkey Alt+O in object mode doesn't work

Browse Source
This commit is contained in:
Matt Ebb
2010-03-29 07:07:20 +00:00
parent bd7ed4f077
commit 86b30beb45
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/curve/curve_ops.c
View File

@@ -216,6 +216,6 @@ void ED_keymap_curve(wmKeyConfig *keyconf)
/* menus */
WM_keymap_add_menu(keymap, "VIEW3D_MT_hook", HKEY, KM_PRESS, KM_CTRL, 0);
ED_object_generic_keymap(keyconf, keymap, TRUE);
ED_object_generic_keymap(keyconf, keymap, 2);
}

2
source/blender/editors/mesh/mesh_ops.c
View File

@@ -309,6 +309,6 @@ void ED_keymap_mesh(wmKeyConfig *keyconf)
WM_keymap_add_menu(keymap, "VIEW3D_MT_uv_map", UKEY, KM_PRESS, 0, 0);
WM_keymap_add_menu(keymap, "VIEW3D_MT_vertex_group", GKEY, KM_PRESS, KM_CTRL, 0);
ED_object_generic_keymap(keyconf, keymap, TRUE);
ED_object_generic_keymap(keyconf, keymap, 2);
}

17
source/blender/editors/object/object_ops.c
View File

@@ -274,7 +274,7 @@ void ED_keymap_object(wmKeyConfig *keyconf)
keymap->poll= object_mode_poll;
/* object mode supports PET now */
ED_object_generic_keymap(keyconf, keymap, TRUE);
ED_object_generic_keymap(keyconf, keymap, 1);
WM_keymap_add_item(keymap, "VIEW3D_OT_game_start", PKEY, KM_PRESS, 0, 0);
@@ -362,7 +362,7 @@ void ED_keymap_object(wmKeyConfig *keyconf)
/* menus */
WM_keymap_add_menu(keymap, "VIEW3D_MT_hook", HKEY, KM_PRESS, KM_CTRL, 0);
ED_object_generic_keymap(keyconf, keymap, TRUE);
ED_object_generic_keymap(keyconf, keymap, 1);
}
void ED_object_generic_keymap(struct wmKeyConfig *keyconf, struct wmKeyMap *keymap, int do_pet)
@@ -370,7 +370,7 @@ void ED_object_generic_keymap(struct wmKeyConfig *keyconf, struct wmKeyMap *keym
wmKeyMapItem *kmi;
/* used by mesh, curve & lattice only */
if(do_pet) {
if(do_pet > 0) {
/* context ops */
kmi = WM_keymap_add_item(keymap, "WM_OT_context_cycle_enum", OKEY, KM_PRESS, KM_SHIFT, 0);
RNA_string_set(kmi->ptr, "path", "tool_settings.proportional_editing_falloff");
@@ -380,10 +380,13 @@ void ED_object_generic_keymap(struct wmKeyConfig *keyconf, struct wmKeyMap *keym
RNA_string_set(kmi->ptr, "value_1", "DISABLED");
RNA_string_set(kmi->ptr, "value_2", "ENABLED");
kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle_enum", OKEY, KM_PRESS, KM_ALT, 0);
RNA_string_set(kmi->ptr, "path", "tool_settings.proportional_editing");
RNA_string_set(kmi->ptr, "value_1", "DISABLED");
RNA_string_set(kmi->ptr, "value_2", "CONNECTED");
/* for modes/object types that allow 'conencted' mode, add the Alt O key */
if (do_pet > 1) {
kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle_enum", OKEY, KM_PRESS, KM_ALT, 0);
RNA_string_set(kmi->ptr, "path", "tool_settings.proportional_editing");
RNA_string_set(kmi->ptr, "value_1", "DISABLED");
RNA_string_set(kmi->ptr, "value_2", "CONNECTED");
}
}
}

2
source/blender/editors/uvedit/uvedit_ops.c
View File

@@ -3243,7 +3243,7 @@ void ED_keymap_uvedit(wmKeyConfig *keyconf)
/* menus */
WM_keymap_add_menu(keymap, "IMAGE_MT_uvs_snap", SKEY, KM_PRESS, KM_SHIFT, 0);
ED_object_generic_keymap(keyconf, keymap, TRUE);
ED_object_generic_keymap(keyconf, keymap, 1);
transform_keymap_for_space(keyconf, keymap, SPACE_IMAGE);
}