diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-10-21 00:59:02 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-10-21 00:59:02 +0400 |
commit | 487a5045c91e1f910e947ed53a2f5b0e652b855b (patch) | |
tree | 18b8609e198e72bc8c3dac32e9f450deb7d35fa3 /source | |
parent | a864b7037ba0bd30d2a5383126affc3c662703e0 (diff) |
[#19688] pressing O and alt+O doesn't toggle proportional edit mode when editing a lattice.
- proportional edit keybindings for particle and lattice
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/BKE_global.h | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_ops.c | 2 | ||||
-rw-r--r-- | source/blender/editors/physics/physics_ops.c | 3 | ||||
-rw-r--r-- | source/blender/editors/space_api/spacetypes.c | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h index dd846038603..2e9ac2f65f0 100644 --- a/source/blender/blenkernel/BKE_global.h +++ b/source/blender/blenkernel/BKE_global.h @@ -110,7 +110,7 @@ typedef struct Global { #define G_BACKBUFSEL (1 << 4) #define G_PICKSEL (1 << 5) -/* #define G_FACESELECT (1 << 8) use mesh mode */ +/* #define G_FACESELECT (1 << 8) use (mesh->editflag & ME_EDIT_PAINT_MASK) */ #define G_DEBUG (1 << 12) #define G_DOSCRIPTLINKS (1 << 13) diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c index 4d823a842b4..8950fdcb049 100644 --- a/source/blender/editors/object/object_ops.c +++ b/source/blender/editors/object/object_ops.c @@ -286,6 +286,8 @@ void ED_keymap_object(wmKeyConfig *keyconf) keymap->poll= ED_operator_editlattice; WM_keymap_add_item(keymap, "LATTICE_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0); + + ED_object_generic_keymap(keyconf, keymap, TRUE); } void ED_object_generic_keymap(struct wmKeyConfig *keyconf, struct wmKeyMap *keymap, int do_pet) diff --git a/source/blender/editors/physics/physics_ops.c b/source/blender/editors/physics/physics_ops.c index ee46279d567..8fb91a6c296 100644 --- a/source/blender/editors/physics/physics_ops.c +++ b/source/blender/editors/physics/physics_ops.c @@ -35,6 +35,7 @@ #include "WM_types.h" #include "ED_physics.h" +#include "ED_object.h" #include "physics_intern.h" // own include @@ -111,6 +112,8 @@ static void keymap_particle(wmKeyConfig *keyconf) RNA_enum_set(WM_keymap_add_item(keymap, "PARTICLE_OT_brush_radial_control", FKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "mode", WM_RADIALCONTROL_STRENGTH); WM_keymap_add_item(keymap, "PARTICLE_OT_specials_menu", WKEY, KM_PRESS, 0, 0); + + ED_object_generic_keymap(keyconf, keymap, 1); } /******************************* boids *************************************/ diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c index 60b9c5a6da7..bdcfd20b5f0 100644 --- a/source/blender/editors/space_api/spacetypes.c +++ b/source/blender/editors/space_api/spacetypes.c @@ -126,7 +126,7 @@ void ED_spacetypes_keymap(wmKeyConfig *keyconf) ED_keymap_anim(keyconf); ED_keymap_animchannels(keyconf); ED_keymap_gpencil(keyconf); - ED_keymap_object(keyconf); + ED_keymap_object(keyconf); /* defines lattice also */ ED_keymap_mesh(keyconf); ED_keymap_uvedit(keyconf); ED_keymap_curve(keyconf); |