diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-08-30 12:22:03 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-30 12:22:03 +0400 |
| commit | 43ab8e86247b7889d16d915b4f370ceb618aaad4 (patch) | |
| tree | 64b1fec1adcc399eb1de5cd86ebafd753a921d8d /source/blender/editors/space_outliner/outliner_ops.c | |
| parent | 5b5e600db6f529ad7e1af9d4bb3a193be2265342 (diff) | |
| parent | d049a722fea3d150fbfad06ffdbbb5c150717134 (diff) | |
* Merge trunk up to r39790.soc-2011-pepper
* Subversion bump (also for init_userdef_do_versions).
* Minor fix for compilation without ffmpeg.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_ops.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner_ops.c b/source/blender/editors/space_outliner/outliner_ops.c index 3e83da13e55..0d3f2e85414 100644 --- a/source/blender/editors/space_outliner/outliner_ops.c +++ b/source/blender/editors/space_outliner/outliner_ops.c @@ -83,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); |