diff options
| author | Juan Linietsky | 2015-04-09 00:31:07 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-04-09 00:31:07 -0300 |
| commit | b967bb73c265904005957cb02148ccc7d53e6d8f (patch) | |
| tree | ea501bdd391825986fcf09d163446d4de95f5701 /tools/editor/scene_tree_editor.cpp | |
| parent | d148a0384821a05f8714099cf00e1b521643a2ad (diff) | |
| parent | dd12bd406e0c0b0c18047dcaf6a9e5bac95f1ee6 (diff) | |
| download | godot-b967bb73c265904005957cb02148ccc7d53e6d8f.tar.gz godot-b967bb73c265904005957cb02148ccc7d53e6d8f.tar.zst godot-b967bb73c265904005957cb02148ccc7d53e6d8f.zip | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'tools/editor/scene_tree_editor.cpp')
| -rw-r--r-- | tools/editor/scene_tree_editor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/editor/scene_tree_editor.cpp b/tools/editor/scene_tree_editor.cpp index e9ec0199d..685c5a973 100644 --- a/tools/editor/scene_tree_editor.cpp +++ b/tools/editor/scene_tree_editor.cpp @@ -117,7 +117,7 @@ void SceneTreeEditor::_cell_button_pressed(Object *p_item,int p_column,int p_id) Spatial *ci = n->cast_to<Spatial>(); if (!ci->is_visible() && ci->get_parent_spatial() && !ci->get_parent_spatial()->is_visible()) { error->set_text("This item cannot be made visible because the parent is hidden. Unhide the parent first."); - error->popup_centered_minsize(Size2(400,80)); + error->popup_centered_minsize(); return; } @@ -131,7 +131,7 @@ void SceneTreeEditor::_cell_button_pressed(Object *p_item,int p_column,int p_id) CanvasItem *ci = n->cast_to<CanvasItem>(); if (!ci->is_visible() && ci->get_parent_item() && !ci->get_parent_item()->is_visible()) { error->set_text("This item cannot be made visible because the parent is hidden. Unhide the parent first."); - error->popup_centered_minsize(Size2(400,80)); + error->popup_centered_minsize(); return; } bool v = !bool(n->call("is_hidden")); |