diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2012-08-06 13:59:24 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2012-08-06 13:59:24 +0400 |
| commit | b8905ba0a6731d2aba6f3487be58b338f35df5f7 (patch) | |
| tree | e3dc4fc0ac799aec6d7f28dcfb16d87c53ec5506 /source/blender/editors/space_nla/nla_edit.c | |
| parent | 79f638791d5a0ab6c07cd21c82decdc24329d825 (diff) | |
| parent | 3b743582ec282cfffc84c5e235f58fe2745327c9 (diff) | |
Merge from trunk r49109-r49601
Diffstat (limited to 'source/blender/editors/space_nla/nla_edit.c')
| -rw-r--r-- | source/blender/editors/space_nla/nla_edit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_nla/nla_edit.c b/source/blender/editors/space_nla/nla_edit.c index 5c9994e46d3..a3e9ca1c4a2 100644 --- a/source/blender/editors/space_nla/nla_edit.c +++ b/source/blender/editors/space_nla/nla_edit.c @@ -266,8 +266,8 @@ static void get_nlastrip_extents(bAnimContext *ac, float *min, float *max, const /* only consider selected strips? */ if ((onlySel == 0) || (strip->flag & NLASTRIP_FLAG_SELECT)) { /* extend range if appropriate */ - *min = MIN2(*min, strip->start); - *max = MAX2(*max, strip->end); + *min = minf(*min, strip->start); + *max = maxf(*max, strip->end); } } } |