diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2011-09-01 21:49:57 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2011-09-01 21:49:57 +0400 |
| commit | e4fd20c20c6a64678e7fe3907f795f527498414f (patch) | |
| tree | 7fed9b1f23d8f59254ba7cdb022e4d7b5ba6fe0c /source/blender/editors/space_outliner/outliner_ops.c | |
| parent | e89046907327228fe0c8e5f554341d791e0fe0a5 (diff) | |
| parent | f940e5fdd91ef02a454cd6a509f76953a77754dd (diff) | |
Merging r39652 through r39842 from trunk into vgroup_modifiers.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_ops.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_ops.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/source/blender/editors/space_outliner/outliner_ops.c b/source/blender/editors/space_outliner/outliner_ops.c index f3e2c352172..0d3f2e85414 100644 --- a/source/blender/editors/space_outliner/outliner_ops.c +++ b/source/blender/editors/space_outliner/outliner_ops.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or @@ -58,13 +56,8 @@ void outliner_operatortypes(void) WM_operatortype_append(OUTLINER_OT_id_operation); WM_operatortype_append(OUTLINER_OT_data_operation); WM_operatortype_append(OUTLINER_OT_animdata_operation); - -#if 0 // GSOC_PEPPER - WM_operatortype_append(OUTLINER_OT_action_set); -#endif // GSOC_PEPPER - WM_operatortype_append(OUTLINER_OT_show_one_level); WM_operatortype_append(OUTLINER_OT_show_active); WM_operatortype_append(OUTLINER_OT_show_hierarchy); @@ -90,8 +83,8 @@ void outliner_keymap(wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "OUTLINER_OT_item_rename", LEFTMOUSE, KM_DBL_CLICK, 0, 0); - RNA_boolean_set(WM_keymap_add_item(keymap, "OUTLINER_OT_item_activate", LEFTMOUSE, KM_RELEASE, 0, 0)->ptr, "extend", 0); - RNA_boolean_set(WM_keymap_add_item(keymap, "OUTLINER_OT_item_activate", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "extend", 1); + RNA_boolean_set(WM_keymap_add_item(keymap, "OUTLINER_OT_item_activate", LEFTMOUSE, KM_CLICK, 0, 0)->ptr, "extend", 0); + RNA_boolean_set(WM_keymap_add_item(keymap, "OUTLINER_OT_item_activate", LEFTMOUSE, KM_CLICK, KM_SHIFT, 0)->ptr, "extend", 1); RNA_boolean_set(WM_keymap_add_item(keymap, "OUTLINER_OT_item_openclose", RETKEY, KM_PRESS, 0, 0)->ptr, "all", 0); RNA_boolean_set(WM_keymap_add_item(keymap, "OUTLINER_OT_item_openclose", RETKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "all", 1); |