diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-06 22:40:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-06 22:40:15 +0400 |
| commit | 31d2ee9bf77bb991ea4779c47379b2cee84b27ed (patch) | |
| tree | fd6f021356fc78d6dfeff9f18f601ce645dd7ffe /source/blender/editors/animation/anim_markers.c | |
| parent | 7b7214c72233f72268f72d31fd8626a0f94e557e (diff) | |
style cleanup, brackets in else/if, some indentation.
Diffstat (limited to 'source/blender/editors/animation/anim_markers.c')
| -rw-r--r-- | source/blender/editors/animation/anim_markers.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index 7f7b1b28319..b3efeffe1d9 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -83,10 +83,10 @@ static ListBase *context_get_markers(Scene *scene, ScrArea *sa) /* local markers can only be shown when there's only a single active action to grab them from * - flag only takes effect when there's an action, otherwise it can get too confusing? */ - if (ELEM(saction->mode, SACTCONT_ACTION, SACTCONT_SHAPEKEY) && (saction->action)) - { - if (saction->flag & SACTION_POSEMARKERS_SHOW) + if (ELEM(saction->mode, SACTCONT_ACTION, SACTCONT_SHAPEKEY) && (saction->action)) { + if (saction->flag & SACTION_POSEMARKERS_SHOW) { return &saction->action->markers; + } } } } @@ -851,8 +851,7 @@ static int ed_marker_move_modal(bContext *C, wmOperator *op, wmEvent *evt) float vec[3]; char str_tx[256]; - if (handleNumInput(&mm->num, evt)) - { + if (handleNumInput(&mm->num, evt)) { applyNumInput(&mm->num, vec); outputNumInput(&mm->num, str_tx); |