diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-12-21 09:07:26 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-21 09:07:26 +0400 |
| commit | b2c66e268f68ee406e5e05a65d9d1609b65d20c4 (patch) | |
| tree | 722192b9fe1d7af57695860fc3639781bedf5f2b /source/blender/editors/armature | |
| parent | e09ddf0d4ba6f6d1e8963d41eef153dadce482f8 (diff) | |
replace MIN/MAX 3,4 with inline functions
Diffstat (limited to 'source/blender/editors/armature')
| -rw-r--r-- | source/blender/editors/armature/reeb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/armature/reeb.c b/source/blender/editors/armature/reeb.c index b1bf13db69b..1b5c550df11 100644 --- a/source/blender/editors/armature/reeb.c +++ b/source/blender/editors/armature/reeb.c @@ -634,7 +634,7 @@ static void mergeArcBuckets(ReebArc *aDst, ReebArc *aSrc, float start, float end if (aDst->bcount > 0 && aSrc->bcount > 0) { int indexDst = 0, indexSrc = 0; - start = MAX3(start, aDst->buckets[0].val, aSrc->buckets[0].val); + start = max_fff(start, aDst->buckets[0].val, aSrc->buckets[0].val); while (indexDst < aDst->bcount && aDst->buckets[indexDst].val < start) { indexDst++; |