diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-05-15 17:35:29 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-05-15 17:35:29 +0400 |
| commit | 070f32f77806bed40086621f96e372c383ba9d96 (patch) | |
| tree | a0126eb3779391dac2614448fb383103fc71deba /source/blender/blenkernel/intern/fcurve.c | |
| parent | e295cfd4d5e9adcd006cbab95f84eb93a73ea6bc (diff) | |
| parent | b4d46e5dedfa88951558a4f941d987a171594a0a (diff) | |
NLA Branch: Merge from 2.5 20116:20214
Diffstat (limited to 'source/blender/blenkernel/intern/fcurve.c')
| -rw-r--r-- | source/blender/blenkernel/intern/fcurve.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c index 1a40911170e..b30eba5a631 100644 --- a/source/blender/blenkernel/intern/fcurve.c +++ b/source/blender/blenkernel/intern/fcurve.c @@ -210,8 +210,10 @@ void calc_fcurve_bounds (FCurve *fcu, float *xmin, float *xmax, float *ymin, flo BezTriple *bezt; for (bezt=fcu->bezt, i=0; i < fcu->totvert; bezt++, i++) { - yminv= MIN2(yminv, bezt->vec[1][1]); - ymaxv= MAX2(ymaxv, bezt->vec[1][1]); + if (bezt->vec[1][1] < yminv) + yminv= bezt->vec[1][1]; + if (bezt->vec[1][1] > ymaxv) + ymaxv= bezt->vec[1][1]; } } } @@ -227,8 +229,10 @@ void calc_fcurve_bounds (FCurve *fcu, float *xmin, float *xmax, float *ymin, flo FPoint *fpt; for (fpt=fcu->fpt, i=0; i < fcu->totvert; fpt++, i++) { - yminv= MIN2(yminv, fpt->vec[1]); - ymaxv= MAX2(ymaxv, fpt->vec[1]); + if (fpt->vec[1] < yminv) + yminv= fpt->vec[1]; + if (fpt->vec[1] > ymaxv) + ymaxv= fpt->vec[1]; } } } |