[#19688] pressing O and alt+O doesn't toggle proportional edit mode when editing...
authorCampbell Barton <ideasman42@gmail.com>
Tue, 20 Oct 2009 20:59:02 +0000 (20:59 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 20 Oct 2009 20:59:02 +0000 (20:59 +0000)
- proportional edit keybindings for particle and lattice

source/blender/blenkernel/BKE_global.h
source/blender/editors/object/object_ops.c
source/blender/editors/physics/physics_ops.c
source/blender/editors/space_api/spacetypes.c

index dd846038603ee12e5a3783a331d1a0b8566fcce5..2e9ac2f65f0adfbd1e89f55469169643eaaf2fb9 100644 (file)
@@ -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)
index 4d823a842b47abbf90291ec82f00400780264168..8950fdcb04904ea942b83dcc3c6961736cada0a4 100644 (file)
@@ -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)
index ee46279d56708dca7171e472c84e73e1f444058b..8fb91a6c29680daf6b3b2297190ee85e30f0a2f1 100644 (file)
@@ -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 *************************************/
index 60b9c5a6da702b2c0ee1c54a0fc4daa33d56a809..bdcfd20b5f0846274f240dc949d4d1ff47a2df66 100644 (file)
@@ -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);