diff options
author | Juan Linietsky <reduzio@gmail.com> | 2017-02-21 00:05:15 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2017-02-21 00:06:30 -0300 |
commit | de0045cf1b0a5e20fbf74da192039d344ee8d0c7 (patch) | |
tree | 2581bd8995461f1c3d9245f336fd88175b52770e /tools/editor/property_editor.cpp | |
parent | 6e2bf31e5a8f3dbe18e31b1aff9c26ee184ad8c8 (diff) |
-renamed globals.h to global_config.cpp (this seems to have caused a few modified files)
-.pck and .zip exporting redone, seems to be working..
Diffstat (limited to 'tools/editor/property_editor.cpp')
-rw-r--r-- | tools/editor/property_editor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp index 9fc47b7da4..19b7b2ce66 100644 --- a/tools/editor/property_editor.cpp +++ b/tools/editor/property_editor.cpp @@ -33,7 +33,7 @@ #include "io/image_loader.h" #include "class_db.h" #include "print_string.h" -#include "globals.h" +#include "global_config.h" #include "scene/resources/font.h" #include "pair.h" #include "scene/scene_string_names.h" @@ -48,7 +48,7 @@ #include "editor_file_system.h" #include "create_dialog.h" #include "property_selector.h" -#include "globals.h" +#include "global_config.h" void CustomPropertyEditor::_notification(int p_what) { |