From 0f54c3a9b75be8f8db9022fb0aeb0f8d0d4f0299 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Mon, 22 Oct 2018 13:53:36 +0200 Subject: Outliner: drag&drop - separate moving from parenting Use drag&drop to parent objects in the outliner by holding down shift. Previously it was easy to accidently parent objects and there was no way to notice it immediatly. In some views it is possible to parent objects without using shift; should be obvious from context. Reviewers: brecht Differential Revision: https://developer.blender.org/D3812 --- source/blender/editors/space_outliner/outliner_ops.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source/blender/editors/space_outliner/outliner_ops.c') diff --git a/source/blender/editors/space_outliner/outliner_ops.c b/source/blender/editors/space_outliner/outliner_ops.c index 2794c79eeb2..089b153fa26 100644 --- a/source/blender/editors/space_outliner/outliner_ops.c +++ b/source/blender/editors/space_outliner/outliner_ops.c @@ -156,6 +156,7 @@ void outliner_keymap(wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "OUTLINER_OT_operation", RIGHTMOUSE, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "OUTLINER_OT_item_drag_drop", EVT_TWEAK_L, KM_ANY, 0, 0); + WM_keymap_add_item(keymap, "OUTLINER_OT_item_drag_drop", EVT_TWEAK_L, KM_ANY, KM_SHIFT, 0); WM_keymap_add_item(keymap, "OUTLINER_OT_show_hierarchy", HOMEKEY, KM_PRESS, 0, 0); -- cgit v1.2.3