diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-12-22 07:11:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-12-22 07:12:19 +0400 |
| commit | c1c26c36f62c3bfdb40b01f33004695a09ce2f4d (patch) | |
| tree | 21e738fefe0c7d77af7c1129bcdfef65e1a8f655 /source/blender/editors/animation | |
| parent | 5eb96d4705b93a7049ecabd0827e0e58b28a2838 (diff) | |
Style Cleanup: remove preprocessor indentation (updated wiki style guide too)
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/anim_channels_edit.c | 8 | ||||
| -rw-r--r-- | source/blender/editors/animation/keyframes_edit.c | 20 |
2 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index 338ee646b03..57bf6978174 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -215,10 +215,10 @@ void ANIM_deselect_anim_channels(bAnimContext *ac, void *data, short datatype, s sel = ACHANNEL_SETFLAG_CLEAR; break; case ANIMTYPE_OBJECT: - #if 0 /* for now, do not take object selection into account, since it gets too annoying */ +#if 0 /* for now, do not take object selection into account, since it gets too annoying */ if (ale->flag & SELECT) sel = ACHANNEL_SETFLAG_CLEAR; - #endif +#endif break; case ANIMTYPE_GROUP: if (ale->flag & AGRP_SELECTED) @@ -286,7 +286,7 @@ void ANIM_deselect_anim_channels(bAnimContext *ac, void *data, short datatype, s } case ANIMTYPE_OBJECT: { - #if 0 /* for now, do not take object selection into account, since it gets too annoying */ +#if 0 /* for now, do not take object selection into account, since it gets too annoying */ Base *base = (Base *)ale->data; Object *ob = base->object; @@ -296,7 +296,7 @@ void ANIM_deselect_anim_channels(bAnimContext *ac, void *data, short datatype, s if (ob->adt) { ACHANNEL_SET_FLAG(ob, sel, ADT_UI_SELECTED); } - #endif +#endif break; } case ANIMTYPE_GROUP: diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c index 71717284d8e..65669062667 100644 --- a/source/blender/editors/animation/keyframes_edit.c +++ b/source/blender/editors/animation/keyframes_edit.c @@ -445,9 +445,9 @@ static short ok_bezier_frame(KeyframeEditData *ked, BezTriple *bezt) short ok = 0; /* frame is stored in f1 property (this float accuracy check may need to be dropped?) */ - #define KEY_CHECK_OK(_index) IS_EQF(bezt->vec[_index][0], ked->f1) +#define KEY_CHECK_OK(_index) IS_EQF(bezt->vec[_index][0], ked->f1) KEYFRAME_OK_CHECKS(KEY_CHECK_OK); - #undef KEY_CHECK_OK +#undef KEY_CHECK_OK /* return ok flags */ return ok; @@ -458,9 +458,9 @@ static short ok_bezier_framerange(KeyframeEditData *ked, BezTriple *bezt) short ok = 0; /* frame range is stored in float properties */ - #define KEY_CHECK_OK(_index) ((bezt->vec[_index][0] > ked->f1) && (bezt->vec[_index][0] < ked->f2)) +#define KEY_CHECK_OK(_index) ((bezt->vec[_index][0] > ked->f1) && (bezt->vec[_index][0] < ked->f2)) KEYFRAME_OK_CHECKS(KEY_CHECK_OK); - #undef KEY_CHECK_OK +#undef KEY_CHECK_OK /* return ok flags */ return ok; @@ -485,9 +485,9 @@ static short ok_bezier_value(KeyframeEditData *ked, BezTriple *bezt) * - this float accuracy check may need to be dropped? * - should value be stored in f2 instead so that we won't have conflicts when using f1 for frames too? */ - #define KEY_CHECK_OK(_index) IS_EQF(bezt->vec[_index][1], ked->f1) +#define KEY_CHECK_OK(_index) IS_EQF(bezt->vec[_index][1], ked->f1) KEYFRAME_OK_CHECKS(KEY_CHECK_OK); - #undef KEY_CHECK_OK +#undef KEY_CHECK_OK /* return ok flags */ return ok; @@ -498,9 +498,9 @@ static short ok_bezier_valuerange(KeyframeEditData *ked, BezTriple *bezt) short ok = 0; /* value range is stored in float properties */ - #define KEY_CHECK_OK(_index) ((bezt->vec[_index][1] > ked->f1) && (bezt->vec[_index][1] < ked->f2)) +#define KEY_CHECK_OK(_index) ((bezt->vec[_index][1] > ked->f1) && (bezt->vec[_index][1] < ked->f2)) KEYFRAME_OK_CHECKS(KEY_CHECK_OK); - #undef KEY_CHECK_OK +#undef KEY_CHECK_OK /* return ok flags */ return ok; @@ -512,9 +512,9 @@ static short ok_bezier_region(KeyframeEditData *ked, BezTriple *bezt) if (ked->data) { short ok = 0; - #define KEY_CHECK_OK(_index) BLI_rctf_isect_pt_v(ked->data, bezt->vec[_index]) +#define KEY_CHECK_OK(_index) BLI_rctf_isect_pt_v(ked->data, bezt->vec[_index]) KEYFRAME_OK_CHECKS(KEY_CHECK_OK); - #undef KEY_CHECK_OK +#undef KEY_CHECK_OK /* return ok flags */ return ok; |