diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-27 16:49:59 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-27 16:49:59 +0300 |
commit | 58adc586612e695d04033f2029362f279a9c05a4 (patch) | |
tree | 0ebe8d1958f179e54a07eb44456002d46816a593 /source/blender/editors/animation/anim_markers.c | |
parent | 0f6b2504f80edddc76c104e9df0722fbb7d484a7 (diff) | |
parent | a247b53084760498ca81eb6bdb901dee8f3a02ca (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/animation/anim_markers.c')
-rw-r--r-- | source/blender/editors/animation/anim_markers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index e0f9a546dfc..a1e7df39014 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -636,7 +636,7 @@ static int ed_markers_opwrap_invoke(bContext *C, wmOperator *op, const wmEvent * /* ************************** add markers *************************** */ -/* add TimeMarker at curent frame */ +/* add TimeMarker at current frame */ static int ed_marker_add_exec(bContext *C, wmOperator *UNUSED(op)) { ListBase *markers = ED_context_get_markers(C); @@ -863,7 +863,7 @@ static int ed_marker_move_invoke_wrapper(bContext *C, wmOperator *op, const wmEv return ed_markers_opwrap_invoke_custom(C, op, event, ed_marker_move_invoke); } -/* note, init has to be called succesfully */ +/* note, init has to be called successfully */ static void ed_marker_move_apply(bContext *C, wmOperator *op) { #ifdef DURIAN_CAMERA_SWITCH |