Commit: bb4a0a9c05a8aaab617b5e615ce55040bb6b2e63 Author: Antony Riakiotakis Date: Thu Jan 29 12:42:36 2015 +0100 Branches: gooseberry https://developer.blender.org/rBbb4a0a9c05a8aaab617b5e615ce55040bb6b2e63
Merge branch 'master' into gooseberry =================================================================== =================================================================== diff --cc source/blender/editors/space_sequencer/sequencer_intern.h index adc9e50,461c729..37b801d --- a/source/blender/editors/space_sequencer/sequencer_intern.h +++ b/source/blender/editors/space_sequencer/sequencer_intern.h @@@ -131,9 -131,8 +131,10 @@@ void SEQUENCER_OT_copy(struct wmOperato void SEQUENCER_OT_paste(struct wmOperatorType *ot); void SEQUENCER_OT_rebuild_proxy(struct wmOperatorType *ot); + void SEQUENCER_OT_enable_proxies(struct wmOperatorType *ot); +void SEQUENCER_OT_overdrop_transform(struct wmOperatorType *ot); + /* preview specific operators */ void SEQUENCER_OT_view_all_preview(struct wmOperatorType *ot); _______________________________________________ Bf-blender-cvs mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-blender-cvs
