summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-02-09 00:07:44 +0100
committerRémi Verschelde <rverschelde@gmail.com>2017-02-09 00:08:27 +0100
commitb87a232668d9f9f3b32c2fceb60bc5f6ef46df22 (patch)
tree40bf3a8b94fbca24f9bf144e4ac9eee7f3c011d0 /main
parentb19c9bd1983b8c72621595b7c22daade4ebf6625 (diff)
Reorder the folders in tools to prepare moving tools/editor
- `certs` and `editor_fonts` go to `thirdparty` - `dist` and `scripts` go to a new `misc` folder - `collada` and `doc` go to `tools/editor` The next step will be to rename `tools/editor` to `editor` directly, but this will be done at the right time to avoid breaking too many PRs.
Diffstat (limited to 'main')
-rw-r--r--main/main.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/main/main.cpp b/main/main.cpp
index 3707c93fc5..21a839a25f 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -54,18 +54,14 @@
#include "scene/main/viewport.h"
#ifdef TOOLS_ENABLED
+#include "tools/editor/doc/doc_data.h"
#include "tools/editor/editor_node.h"
#include "tools/editor/project_manager.h"
-
#endif
#include "io/file_access_network.h"
-#include "tools/doc/doc_data.h"
-
-
#include "servers/physics_2d_server.h"
-
#include "core/io/stream_peer_tcp.h"
#include "core/os/thread.h"
#include "core/io/file_access_pack.h"