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/property_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/property_editor.cpp')
| -rw-r--r-- | tools/editor/property_editor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp index 3fd713c5b..09643c95d 100644 --- a/tools/editor/property_editor.cpp +++ b/tools/editor/property_editor.cpp @@ -766,7 +766,7 @@ void CustomPropertyEditor::_file_selected(String p_file) { RES res = ResourceLoader::load(p_file,type); if (res.is_null()) { error->set_text("Error loading file: Not a resource!"); - error->popup_centered(Size2(300,80)); + error->popup_centered_minsize(); break; } v=res.get_ref_ptr(); |