diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-06-05 15:52:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-05 15:52:05 +0200 |
| commit | f8d7670e82007103573b88f48fe7b7c4addbd66d (patch) | |
| tree | f4802061ca26ae9220ec9a5e9d51d80e1a465faa /core/math/math_2d.cpp | |
| parent | 075c7d8133e4fde353ab54a255638b0c9a3740a5 (diff) | |
| parent | a3c90b029308eb46b7fd83a0cf7b502ecbd79d55 (diff) | |
Merge pull request #9038 from AlexHolly/rect2-rename-pos
renamed all Rect2.pos to Rect2.position
Diffstat (limited to 'core/math/math_2d.cpp')
| -rw-r--r-- | core/math/math_2d.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/math/math_2d.cpp b/core/math/math_2d.cpp index 962a42acb9..52e240ed47 100644 --- a/core/math/math_2d.cpp +++ b/core/math/math_2d.cpp @@ -308,7 +308,7 @@ bool Rect2::intersects_segment(const Point2 &p_from, const Point2 &p_to, Point2 for (int i = 0; i < 2; i++) { real_t seg_from = p_from[i]; real_t seg_to = p_to[i]; - real_t box_begin = pos[i]; + real_t box_begin = position[i]; real_t box_end = box_begin + size[i]; real_t cmin, cmax; real_t csign; |