Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / physics / physics_ops.c
index 7b86cb6..ffa73b4 100644 (file)
@@ -137,23 +137,6 @@ static void keymap_particle(wmKeyConfig *keyconf)
        kmi = WM_keymap_add_item(keymap, "PARTICLE_OT_hide", HKEY, KM_PRESS, KM_SHIFT, 0);
        RNA_boolean_set(kmi->ptr, "unselected", true);
 
-       /* Shift+LMB behavior first, so it has priority over KM_ANY item below. */
-       kmi = WM_keymap_add_item(keymap, "VIEW3D_OT_manipulator", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0);
-       RNA_boolean_set(kmi->ptr, "release_confirm", true);
-       RNA_boolean_set(kmi->ptr, "use_planar_constraint", true);
-       RNA_boolean_set(kmi->ptr, "use_accurate", false);
-
-       kmi = WM_keymap_add_item(keymap, "VIEW3D_OT_manipulator", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0);
-       RNA_boolean_set(kmi->ptr, "release_confirm", true);
-       RNA_boolean_set(kmi->ptr, "use_planar_constraint", false);
-       RNA_boolean_set(kmi->ptr, "use_accurate", true);
-
-       /* Using KM_ANY here to allow holding modifiers before starting to transform. */
-       kmi = WM_keymap_add_item(keymap, "VIEW3D_OT_manipulator", LEFTMOUSE, KM_PRESS, KM_ANY, 0);
-       RNA_boolean_set(kmi->ptr, "release_confirm", true);
-       RNA_boolean_set(kmi->ptr, "use_planar_constraint", false);
-       RNA_boolean_set(kmi->ptr, "use_accurate", false);
-
        WM_keymap_add_item(keymap, "PARTICLE_OT_brush_edit", LEFTMOUSE, KM_PRESS, 0, 0);
        WM_keymap_add_item(keymap, "PARTICLE_OT_brush_edit", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0);