diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-05-07 15:29:54 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-05-07 15:29:54 +0300 |
| commit | 77f2f23a7ebceda3187a2f5ceab79a46a9537574 (patch) | |
| tree | 910d6fbd5e5c07cc009f8ada0ec2733183428a96 /source/blender/editors/interface/view2d.c | |
| parent | 57013c0a39ac75f22eda1a76bb18881fa590b18a (diff) | |
| parent | 6c243b7e4055fbbefaf52d94219bc9a70726eaeb (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/interface/view2d.c')
| -rw-r--r-- | source/blender/editors/interface/view2d.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index 2a687118eaa..c1791998ec7 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -76,7 +76,7 @@ BLI_INLINE int clamp_float_to_int(const float f) return min; } else if (UNLIKELY(f > max)) { - return max; + return (int)max; } else { return (int)f; |