Merge branch 'master' into blender2.8

This commit is contained in:
2018-02-14 15:16:50 +01:00
26 changed files with 220 additions and 146 deletions

View File

@@ -324,6 +324,26 @@ MINLINE size_t max_zz(size_t a, size_t b)
return (b < a) ? a : b;
}
MINLINE int clamp_i(int value, int min, int max)
{
return min_ii(max_ii(value, min), max);
}
MINLINE float clamp_f(float value, float min, float max)
{
if (value > max) {
return max;
} else if (value < min) {
return min;
}
return value;
}
MINLINE size_t clamp_z(size_t value, size_t min, size_t max)
{
return min_zz(max_zz(value, min), max);
}
/**
* Almost-equal for IEEE floats, using absolute difference method.
*