diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-08-07 13:20:30 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-07 13:20:30 +0400 |
| commit | 8ae89f494225d59f8d28b453e0939a94a9d3ec9d (patch) | |
| tree | db8ad5b8d104202db5defc17b932b9e260be4548 /source/blender/editors/transform | |
| parent | cfe7bab0802eedb5897ba736e61013c31385556c (diff) | |
speedup to inpaint node in my tests was about ~30% for an optimized build.
also replace MIN/MAX2 with inline functions in transform.
Diffstat (limited to 'source/blender/editors/transform')
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index f5d9612e832..6db3ba7c493 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -2509,8 +2509,8 @@ void clipUVData(TransInfo *t) if ((td->flag & TD_SKIP) || (!td->loc)) continue; - td->loc[0] = MIN2(MAX2(0.0f, td->loc[0]), aspx); - td->loc[1] = MIN2(MAX2(0.0f, td->loc[1]), aspy); + td->loc[0] = minf(maxf(0.0f, td->loc[0]), aspx); + td->loc[1] = minf(maxf(0.0f, td->loc[1]), aspy); } } @@ -4258,7 +4258,7 @@ static void freeSeqData(TransInfo *t) for (a = 0; a < t->total; a++, td++) { seq = ((TransDataSeq *)td->extra)->seq; if ((seq != seq_prev)) { - minframe = MIN2(minframe, seq->startdisp); + minframe = mini(minframe, seq->startdisp); } } |