diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-02-09 00:07:44 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-02-09 00:08:27 +0100 |
| commit | b87a232668d9f9f3b32c2fceb60bc5f6ef46df22 (patch) | |
| tree | 40bf3a8b94fbca24f9bf144e4ac9eee7f3c011d0 /tools/editor/import | |
| parent | b19c9bd1983b8c72621595b7c22daade4ebf6625 (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 'tools/editor/import')
| -rw-r--r-- | tools/editor/import/SCsub | 2 | ||||
| -rw-r--r-- | tools/editor/import/editor_import_collada.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/editor/import/SCsub b/tools/editor/import/SCsub index 4bf55189cc..f1fa50148f 100644 --- a/tools/editor/import/SCsub +++ b/tools/editor/import/SCsub @@ -2,4 +2,4 @@ Import('env') Export('env') -env.add_source_files(env.tool_sources, "*.cpp") +env.add_source_files(env.editor_sources, "*.cpp") diff --git a/tools/editor/import/editor_import_collada.cpp b/tools/editor/import/editor_import_collada.cpp index 4d99389f9b..a901de1faf 100644 --- a/tools/editor/import/editor_import_collada.cpp +++ b/tools/editor/import/editor_import_collada.cpp @@ -29,7 +29,6 @@ #include "editor_import_collada.h" -#include "collada/collada.h" #include "scene/3d/spatial.h" #include "scene/3d/skeleton.h" #include "scene/3d/path.h" @@ -40,6 +39,7 @@ #include "scene/resources/animation.h" #include "scene/resources/packed_scene.h" #include "os/os.h" +#include "tools/editor/collada/collada.h" #include "tools/editor/editor_node.h" #include <iostream> |