From eb7f4ddccebfc0aca0a8981f3ba62971cb9838d4 Mon Sep 17 00:00:00 2001 From: groud Date: Sun, 29 Jul 2018 23:09:59 +0200 Subject: Fixes bugs on the 2D editor scrollable area --- editor/plugins/canvas_item_editor_plugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'editor/plugins/canvas_item_editor_plugin.h') diff --git a/editor/plugins/canvas_item_editor_plugin.h b/editor/plugins/canvas_item_editor_plugin.h index adc4010f39..2c943385ad 100644 --- a/editor/plugins/canvas_item_editor_plugin.h +++ b/editor/plugins/canvas_item_editor_plugin.h @@ -390,7 +390,7 @@ class CanvasItemEditor : public VBoxContainer { List _get_edited_canvas_items(bool retreive_locked = false, bool remove_canvas_item_if_parent_in_selection = true); Rect2 _get_encompassing_rect_from_list(List p_list); - void _expand_encompassing_rect_using_children(Rect2 &p_rect, const Node *p_node, bool &r_first, const Transform2D &p_parent_xform = Transform2D(), const Transform2D &p_canvas_xform = Transform2D()); + void _expand_encompassing_rect_using_children(Rect2 &p_rect, const Node *p_node, bool &r_first, const Transform2D &p_parent_xform = Transform2D(), const Transform2D &p_canvas_xform = Transform2D(), bool include_locked_nodes = true); Rect2 _get_encompassing_rect(const Node *p_node); Object *_get_editor_data(Object *p_what); -- cgit v1.2.3