Browse Source

Merge pull request #9055 from noshyaar/pr-fix

Fix build error on master, commit f8d7670
Rémi Verschelde 8 years ago
parent
commit
b5837b333b
2 changed files with 1 additions and 2 deletions
  1. 1 1
      scene/gui/tree.cpp
  2. 0 1
      servers/visual/visual_server_canvas.cpp

+ 1 - 1
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);

+ 0 - 1
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() {