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

Julian Eisel noreply at git.blender.org
Tue Apr 7 15:24:16 CEST 2015


Commit: b8bb9d8cc746b609f02b03aa5f6a0881a3fc65b0
Author: Julian Eisel
Date:   Tue Apr 7 15:23:49 2015 +0200
Branches: wiggly-widgets
https://developer.blender.org/rBb8bb9d8cc746b609f02b03aa5f6a0881a3fc65b0

Merge branch 'master' into wiggly-widgets

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



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

diff --cc source/blender/blenkernel/CMakeLists.txt
index 35690bf,67c8f0f..9fb49ac
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -212,8 -211,9 +212,10 @@@ set(SR
  	BKE_depsgraph.h
  	BKE_displist.h
  	BKE_dynamicpaint.h
+ 	BKE_editmesh.h
+ 	BKE_editmesh_bvh.h
  	BKE_effect.h
 +	BKE_facemap.h
  	BKE_fcurve.h
  	BKE_fluidsim.h
  	BKE_font.h
diff --cc source/blender/editors/space_view3d/view3d_ops.c
index 7048884,6a2c948..56faf94
--- a/source/blender/editors/space_view3d/view3d_ops.c
+++ b/source/blender/editors/space_view3d/view3d_ops.c
@@@ -384,10 -384,10 +384,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_CLICK, 0, 0);
+ 	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle_enum", ZKEY, KM_PRESS, 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");




More information about the Bf-blender-cvs mailing list