[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24023] trunk/blender/source/blender: [ #19688] pressing O and alt+O doesn' t toggle proportional edit mode when editing a lattice.

[Campbell Barton]

Revision: 24023
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24023
Author:   campbellbarton
Date:     2009-10-20 22:59:02 +0200 (Tue, 20 Oct 2009)

Log Message:
-----------
[#19688] pressing O and alt+O doesn't toggle proportional edit mode when editing a lattice.
- proportional edit keybindings for particle and lattice

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_global.h
    trunk/blender/source/blender/editors/object/object_ops.c
    trunk/blender/source/blender/editors/physics/physics_ops.c
    trunk/blender/source/blender/editors/space_api/spacetypes.c

Modified: trunk/blender/source/blender/blenkernel/BKE_global.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_global.h	2009-10-20 20:00:12 UTC (rev 24022)
+++ trunk/blender/source/blender/blenkernel/BKE_global.h	2009-10-20 20:59:02 UTC (rev 24023)
@@ -110,7 +110,7 @@
 #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)

Modified: trunk/blender/source/blender/editors/object/object_ops.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_ops.c	2009-10-20 20:00:12 UTC (rev 24022)
+++ trunk/blender/source/blender/editors/object/object_ops.c	2009-10-20 20:59:02 UTC (rev 24023)
@@ -286,6 +286,8 @@
 	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)

Modified: trunk/blender/source/blender/editors/physics/physics_ops.c
===================================================================
--- trunk/blender/source/blender/editors/physics/physics_ops.c	2009-10-20 20:00:12 UTC (rev 24022)
+++ trunk/blender/source/blender/editors/physics/physics_ops.c	2009-10-20 20:59:02 UTC (rev 24023)
@@ -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 @@
 	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 *************************************/

Modified: trunk/blender/source/blender/editors/space_api/spacetypes.c
===================================================================
--- trunk/blender/source/blender/editors/space_api/spacetypes.c	2009-10-20 20:00:12 UTC (rev 24022)
+++ trunk/blender/source/blender/editors/space_api/spacetypes.c	2009-10-20 20:59:02 UTC (rev 24023)
@@ -126,7 +126,7 @@
 	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);