[Bf-blender-cvs] [12a9993] wiggly-widgets: Merge branch 'master' into wiggly-widgets

[Julian Eisel]

Commit: 12a999305ff97679ef9683a6dcf955886b7f13c8
Author: Julian Eisel
Date:   Fri Apr 3 17:07:57 2015 +0200
Branches: wiggly-widgets
https://developer.blender.org/rB12a999305ff97679ef9683a6dcf955886b7f13c8

Merge branch 'master' into wiggly-widgets

===================================================================



===================================================================

diff --cc source/blender/editors/space_view3d/view3d_ops.c
index ac39750,c5425f2..e21654d
--- a/source/blender/editors/space_view3d/view3d_ops.c
+++ b/source/blender/editors/space_view3d/view3d_ops.c
@@@ -383,10 -383,10 +383,10 @@@ void view3d_keymap(wmKeyConfig *keyconf
  	RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_layers", EIGHTKEY, KM_PRESS, KM_ANY, 0)->ptr, "nr", 8);
  	RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_layers", NINEKEY, KM_PRESS, KM_ANY, 0)->ptr, "nr", 9);
  	RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_layers", ZEROKEY, KM_PRESS, KM_ANY, 0)->ptr, "nr", 10);
 -	
 +
  	/* drawtype */
  
- 	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle_enum", ZKEY, KM_PRESS, 0, 0);
+ 	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle_enum", ZKEY, KM_CLICK, 0, 0);
  	RNA_string_set(kmi->ptr, "data_path", "space_data.viewport_shade");
  	RNA_string_set(kmi->ptr, "value_1", "SOLID");
  	RNA_string_set(kmi->ptr, "value_2", "WIREFRAME");