diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-06-06 11:09:41 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-06-06 11:09:41 -0300 |
| commit | 14c4c1b568ffa40a179332fbc77e9b52c6bdf514 (patch) | |
| tree | eff10eab1255b2e434b471d0609d6da02f8a400a /tools/editor/property_editor.h | |
| parent | 954256268afe89b648d356ee0b296a9e97a07373 (diff) | |
| parent | 697482328863b2790597df1efde0c3a0b4a9772e (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'tools/editor/property_editor.h')
| -rw-r--r-- | tools/editor/property_editor.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/editor/property_editor.h b/tools/editor/property_editor.h index 164643afaa..de5cac8711 100644 --- a/tools/editor/property_editor.h +++ b/tools/editor/property_editor.h @@ -32,7 +32,7 @@ #include "scene/gui/tree.h" #include "scene/gui/button.h" #include "scene/gui/label.h" -#include "scene/gui/file_dialog.h" +#include "tools/editor/editor_file_dialog.h" #include "scene/gui/dialogs.h" #include "scene/gui/color_picker.h" #include "scene/gui/menu_button.h" @@ -75,7 +75,7 @@ class CustomPropertyEditor : public Popup { PopupMenu *menu; SceneTreeDialog *scene_tree; - FileDialog *file; + EditorFileDialog *file; ConfirmationDialog *error; String name; Variant::Type type; |