[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27822] trunk/blender/source/blender/ editors: Fix [#21542] Clear origin shortkey Alt+O in object mode doesn' t work

[Matt Ebb]

Revision: 27822
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27822
Author:   broken
Date:     2010-03-29 09:07:20 +0200 (Mon, 29 Mar 2010)

Log Message:
-----------
Fix [#21542] Clear origin shortkey Alt+O in object mode doesn't work

Modified Paths:
--------------
    trunk/blender/source/blender/editors/curve/curve_ops.c
    trunk/blender/source/blender/editors/mesh/mesh_ops.c
    trunk/blender/source/blender/editors/object/object_ops.c
    trunk/blender/source/blender/editors/uvedit/uvedit_ops.c

Modified: trunk/blender/source/blender/editors/curve/curve_ops.c
===================================================================
--- trunk/blender/source/blender/editors/curve/curve_ops.c	2010-03-29 05:37:34 UTC (rev 27821)
+++ trunk/blender/source/blender/editors/curve/curve_ops.c	2010-03-29 07:07:20 UTC (rev 27822)
@@ -216,6 +216,6 @@
 	/* menus */
 	WM_keymap_add_menu(keymap, "VIEW3D_MT_hook", HKEY, KM_PRESS, KM_CTRL, 0);
 
-	ED_object_generic_keymap(keyconf, keymap, TRUE);
+	ED_object_generic_keymap(keyconf, keymap, 2);
 }
 

Modified: trunk/blender/source/blender/editors/mesh/mesh_ops.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/mesh_ops.c	2010-03-29 05:37:34 UTC (rev 27821)
+++ trunk/blender/source/blender/editors/mesh/mesh_ops.c	2010-03-29 07:07:20 UTC (rev 27822)
@@ -309,6 +309,6 @@
 	WM_keymap_add_menu(keymap, "VIEW3D_MT_uv_map", UKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_menu(keymap, "VIEW3D_MT_vertex_group", GKEY, KM_PRESS, KM_CTRL, 0);
 	
-	ED_object_generic_keymap(keyconf, keymap, TRUE);
+	ED_object_generic_keymap(keyconf, keymap, 2);
 }
 

Modified: trunk/blender/source/blender/editors/object/object_ops.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_ops.c	2010-03-29 05:37:34 UTC (rev 27821)
+++ trunk/blender/source/blender/editors/object/object_ops.c	2010-03-29 07:07:20 UTC (rev 27822)
@@ -274,7 +274,7 @@
 	keymap->poll= object_mode_poll;
 	
 	/* object mode supports PET now */
-	ED_object_generic_keymap(keyconf, keymap, TRUE);
+	ED_object_generic_keymap(keyconf, keymap, 1);
 
 	WM_keymap_add_item(keymap, "VIEW3D_OT_game_start", PKEY, KM_PRESS, 0, 0);
 
@@ -362,7 +362,7 @@
 		/* menus */
 	WM_keymap_add_menu(keymap, "VIEW3D_MT_hook", HKEY, KM_PRESS, KM_CTRL, 0);
 
-	ED_object_generic_keymap(keyconf, keymap, TRUE);
+	ED_object_generic_keymap(keyconf, keymap, 1);
 }
 
 void ED_object_generic_keymap(struct wmKeyConfig *keyconf, struct wmKeyMap *keymap, int do_pet)
@@ -370,7 +370,7 @@
 	wmKeyMapItem *kmi;
 
 	/* used by mesh, curve & lattice only */
-	if(do_pet) {
+	if(do_pet > 0) {
 		/* context ops */
 		kmi = WM_keymap_add_item(keymap, "WM_OT_context_cycle_enum", OKEY, KM_PRESS, KM_SHIFT, 0);
 		RNA_string_set(kmi->ptr, "path", "tool_settings.proportional_editing_falloff");
@@ -380,10 +380,13 @@
 		RNA_string_set(kmi->ptr, "value_1", "DISABLED");
 		RNA_string_set(kmi->ptr, "value_2", "ENABLED");
 
-		kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle_enum", OKEY, KM_PRESS, KM_ALT, 0);
-		RNA_string_set(kmi->ptr, "path", "tool_settings.proportional_editing");
-		RNA_string_set(kmi->ptr, "value_1", "DISABLED");
-		RNA_string_set(kmi->ptr, "value_2", "CONNECTED");
+		/* for modes/object types that allow 'conencted' mode, add the Alt O key */
+		if (do_pet > 1) {
+			kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle_enum", OKEY, KM_PRESS, KM_ALT, 0);
+			RNA_string_set(kmi->ptr, "path", "tool_settings.proportional_editing");
+			RNA_string_set(kmi->ptr, "value_1", "DISABLED");
+			RNA_string_set(kmi->ptr, "value_2", "CONNECTED");
+		}
 	}
 }
 

Modified: trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_ops.c	2010-03-29 05:37:34 UTC (rev 27821)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_ops.c	2010-03-29 07:07:20 UTC (rev 27822)
@@ -3243,7 +3243,7 @@
 	/* menus */
 	WM_keymap_add_menu(keymap, "IMAGE_MT_uvs_snap", SKEY, KM_PRESS, KM_SHIFT, 0);
 
-	ED_object_generic_keymap(keyconf, keymap, TRUE);
+	ED_object_generic_keymap(keyconf, keymap, 1);
 
 	transform_keymap_for_space(keyconf, keymap, SPACE_IMAGE);
 }