diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-03-25 09:58:58 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-03-25 09:58:58 +0300 |
commit | 2bc791437e3b8e42c1369daf15c72934474b1e73 (patch) | |
tree | f2202c3753c8288bea47d3c0edd10bcf01cdf339 /source/blender/editors/animation | |
parent | c3764fe1e80670cd578df7bbc5c37c267e81013a (diff) |
Cleanup: use 'r_' prefix for output arguments
Also pass some args as 'const'.
Diffstat (limited to 'source/blender/editors/animation')
-rw-r--r-- | source/blender/editors/animation/anim_draw.c | 10 | ||||
-rw-r--r-- | source/blender/editors/animation/anim_markers.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c index 77399880b8d..bcb9ddc5889 100644 --- a/source/blender/editors/animation/anim_draw.c +++ b/source/blender/editors/animation/anim_draw.c @@ -515,7 +515,7 @@ float ANIM_unit_mapping_get_factor(Scene *scene, ID *id, FCurve *fcu, short flag return 1.0f; } -static bool find_prev_next_keyframes(struct bContext *C, int *nextfra, int *prevfra) +static bool find_prev_next_keyframes(struct bContext *C, int *r_nextfra, int *r_prevfra) { Scene *scene = CTX_data_scene(C); Object *ob = CTX_data_active_object(C); @@ -594,17 +594,17 @@ static bool find_prev_next_keyframes(struct bContext *C, int *nextfra, int *prev /* any success? */ if (doneprev || donenext) { if (doneprev) { - *prevfra = cfraprev; + *r_prevfra = cfraprev; } else { - *prevfra = CFRA - (cfranext - CFRA); + *r_prevfra = CFRA - (cfranext - CFRA); } if (donenext) { - *nextfra = cfranext; + *r_nextfra = cfranext; } else { - *nextfra = CFRA + (CFRA - cfraprev); + *r_nextfra = CFRA + (CFRA - cfraprev); } return true; diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index 2215021ce1a..7868d453268 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -197,7 +197,7 @@ int ED_markers_find_nearest_marker_time(ListBase *markers, float x) return (nearest) ? (nearest->frame) : round_fl_to_int(x); } -void ED_markers_get_minmax(ListBase *markers, short sel, float *first, float *last) +void ED_markers_get_minmax(ListBase *markers, short sel, float *r_first, float *r_last) { TimeMarker *marker; float min, max; @@ -205,8 +205,8 @@ void ED_markers_get_minmax(ListBase *markers, short sel, float *first, float *la /* sanity check */ // printf("markers = %p - %p, %p\n", markers, markers->first, markers->last); if (ELEM(NULL, markers, markers->first, markers->last)) { - *first = 0.0f; - *last = 0.0f; + *r_first = 0.0f; + *r_last = 0.0f; return; } @@ -224,8 +224,8 @@ void ED_markers_get_minmax(ListBase *markers, short sel, float *first, float *la } /* set the min/max values */ - *first = min; - *last = max; + *r_first = min; + *r_last = max; } /** |