diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-06-05 16:28:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-05 16:28:39 +0200 |
| commit | b5837b333ba53539785f71e9e64f18d01886350b (patch) | |
| tree | 49d2a62a30d48d22c1f52cbcfa75c33da4cb3b61 | |
| parent | f8d7670e82007103573b88f48fe7b7c4addbd66d (diff) | |
| parent | 5fd458e03a32baf0b47c8bd15252d92c634a0da7 (diff) | |
Merge pull request #9055 from noshyaar/pr-fix
Fix build error on master, commit f8d7670
| -rw-r--r-- | scene/gui/tree.cpp | 2 | ||||
| -rw-r--r-- | servers/visual/visual_server_canvas.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index 7d0b8757c8..d864d9fce7 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -1247,7 +1247,7 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2 draw_style_box(cache.custom_button, ir); } ir.size -= cache.custom_button->get_minimum_size(); - ir.pos += cache.custom_button->get_offset(); + ir.position += cache.custom_button->get_offset(); } draw_item_rect(p_item->cells[i], ir, col); diff --git a/servers/visual/visual_server_canvas.cpp b/servers/visual/visual_server_canvas.cpp index b4a133e68a..14a7af3e6e 100644 --- a/servers/visual/visual_server_canvas.cpp +++ b/servers/visual/visual_server_canvas.cpp @@ -233,7 +233,6 @@ void VisualServerCanvas::render_canvas(Canvas *p_canvas, const Transform2D &p_tr } VSG::canvas_render->canvas_end(); - } RID VisualServerCanvas::canvas_create() { |