[Bf-blender-cvs] [6fddcc0] temp_widgets_update_tagging: Merge branch 'master' into temp_widgets_update_tagging

Julian Eisel noreply at git.blender.org
Tue Apr 19 13:32:00 CEST 2016


Commit: 6fddcc0b65bffc3acaf078db2b01d280374cc7fd
Author: Julian Eisel
Date:   Tue Apr 19 13:31:53 2016 +0200
Branches: temp_widgets_update_tagging
https://developer.blender.org/rB6fddcc0b65bffc3acaf078db2b01d280374cc7fd

Merge branch 'master' into temp_widgets_update_tagging

Conflicts:
	source/blender/editors/space_sequencer/sequencer_ops.c

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



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

diff --cc source/blender/editors/space_sequencer/sequencer_ops.c
index 5e1f407,655e029..3cdd75e
--- a/source/blender/editors/space_sequencer/sequencer_ops.c
+++ b/source/blender/editors/space_sequencer/sequencer_ops.c
@@@ -204,8 -203,7 +205,9 @@@ void sequencer_keymap(wmKeyConfig *keyc
  	WM_keymap_add_item(keymap, "SEQUENCER_OT_view_all", HOMEKEY, KM_PRESS, 0, 0);
  	WM_keymap_add_item(keymap, "SEQUENCER_OT_view_all", NDOF_BUTTON_FIT, KM_PRESS, 0, 0);
  	WM_keymap_add_item(keymap, "SEQUENCER_OT_view_selected", PADPERIOD, KM_PRESS, 0, 0);
+ 	WM_keymap_add_item(keymap, "SEQUENCER_OT_view_frame", PAD0, KM_PRESS, 0, 0);
 +	
 +	WM_keymap_add_item(keymap, "SEQUENCER_OT_overdrop_transform", VKEY, KM_PRESS, 0, 0);
  
  	kmi = WM_keymap_add_item(keymap, "SEQUENCER_OT_strip_jump", PAGEUPKEY, KM_PRESS, 0, 0);
  	RNA_boolean_set(kmi->ptr, "next", true);




More information about the Bf-blender-cvs mailing list