asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #9055 from noshyaar/pr-fix

Browse source 
Fix build error on master, commit f8d7670
This commit is contained in:
Rémi Verschelde 2017-06-05 16:28:39 +02:00 committed by GitHub
commit b5837b333b
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scene/gui/tree.cpp
View file

@ -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);

1
servers/visual/visual_server_canvas.cpp
View file

@ -233,7 +233,6 @@ void VisualServerCanvas::render_canvas(Canvas *p_canvas, const Transform2D &p_tr
}
VSG::canvas_render->canvas_end();
}
RID VisualServerCanvas::canvas_create() {