diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-01-10 11:58:05 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-10 11:58:05 +0300 |
commit | 2b56faebe5f2a8e2b37004485206007d22cdac1d (patch) | |
tree | f96042f4c8f9b9c06b3b9f694d207f1bc62a5a5c /source/blender/blenlib | |
parent | 5ff33ecdf0ed319db2e589926a614f67738531a6 (diff) | |
parent | 18f53d8822518928baceab1407eac195ab9bf817 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/intern/rct.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenlib/intern/rct.c b/source/blender/blenlib/intern/rct.c index 3adc6b30f6e..764b12431d0 100644 --- a/source/blender/blenlib/intern/rct.c +++ b/source/blender/blenlib/intern/rct.c @@ -128,7 +128,7 @@ bool BLI_rctf_isect_pt_v(const rctf *rect, const float xy[2]) /** * \returns shortest distance from \a rect to x/y (0 if inside) -*/ + */ int BLI_rcti_length_x(const rcti *rect, const int x) { |