diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-24 09:54:49 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-24 09:56:04 +0100 |
| commit | cfd84625f0dbd5590e94ecf851bd7b7db5c7665b (patch) | |
| tree | 319f6234471eabfec2c7ea62e22763a8a535c53d /editor | |
| parent | 9d245415971a83d7989fc57fa176868aad728841 (diff) | |
Move DocData and Collada out of their subfolders
Now that the unused DocDump was removed, the `editor/doc` subfolder is
redundant.
Similarly, there's no reason for Collada to have a subfolder for itself
when glTF or OBJ don't.
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/SCsub | 4 | ||||
| -rw-r--r-- | editor/collada/SCsub | 5 | ||||
| -rw-r--r-- | editor/doc/SCsub | 5 | ||||
| -rw-r--r-- | editor/doc_data.cpp (renamed from editor/doc/doc_data.cpp) | 0 | ||||
| -rw-r--r-- | editor/doc_data.h (renamed from editor/doc/doc_data.h) | 0 | ||||
| -rw-r--r-- | editor/editor_help.h | 2 | ||||
| -rw-r--r-- | editor/import/collada.cpp (renamed from editor/collada/collada.cpp) | 0 | ||||
| -rw-r--r-- | editor/import/collada.h (renamed from editor/collada/collada.h) | 0 | ||||
| -rw-r--r-- | editor/import/editor_import_collada.cpp | 2 |
9 files changed, 3 insertions, 15 deletions
diff --git a/editor/SCsub b/editor/SCsub index e54383350e..6e8679b770 100644 --- a/editor/SCsub +++ b/editor/SCsub @@ -56,7 +56,7 @@ if env['tools']: except OSError: pass - _make_doc_data_class_path(os.path.join(env.Dir('#').abspath, "editor/doc")) + _make_doc_data_class_path(os.path.join(env.Dir('#').abspath, "editor")) docs = sorted(docs) env.Depends("#editor/doc_data_compressed.gen.h", docs) @@ -85,8 +85,6 @@ if env['tools']: env.add_source_files(env.editor_sources, "*.cpp") - SConscript('collada/SCsub') - SConscript('doc/SCsub') SConscript('debugger/SCsub') SConscript('fileserver/SCsub') SConscript('icons/SCsub') diff --git a/editor/collada/SCsub b/editor/collada/SCsub deleted file mode 100644 index 2b1e889fb0..0000000000 --- a/editor/collada/SCsub +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env python - -Import('env') - -env.add_source_files(env.editor_sources, "*.cpp") diff --git a/editor/doc/SCsub b/editor/doc/SCsub deleted file mode 100644 index 2b1e889fb0..0000000000 --- a/editor/doc/SCsub +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env python - -Import('env') - -env.add_source_files(env.editor_sources, "*.cpp") diff --git a/editor/doc/doc_data.cpp b/editor/doc_data.cpp index 66134b4428..66134b4428 100644 --- a/editor/doc/doc_data.cpp +++ b/editor/doc_data.cpp diff --git a/editor/doc/doc_data.h b/editor/doc_data.h index 073705f0b1..073705f0b1 100644 --- a/editor/doc/doc_data.h +++ b/editor/doc_data.h diff --git a/editor/editor_help.h b/editor/editor_help.h index a690e10e7e..0d3ecf9bd0 100644 --- a/editor/editor_help.h +++ b/editor/editor_help.h @@ -32,7 +32,7 @@ #define EDITOR_HELP_H #include "editor/code_editor.h" -#include "editor/doc/doc_data.h" +#include "editor/doc_data.h" #include "editor/editor_plugin.h" #include "scene/gui/margin_container.h" #include "scene/gui/menu_button.h" diff --git a/editor/collada/collada.cpp b/editor/import/collada.cpp index 8ef9d17083..8ef9d17083 100644 --- a/editor/collada/collada.cpp +++ b/editor/import/collada.cpp diff --git a/editor/collada/collada.h b/editor/import/collada.h index 4707d7d779..4707d7d779 100644 --- a/editor/collada/collada.h +++ b/editor/import/collada.h diff --git a/editor/import/editor_import_collada.cpp b/editor/import/editor_import_collada.cpp index 3cc6e7a50c..f7da8c27f9 100644 --- a/editor/import/editor_import_collada.cpp +++ b/editor/import/editor_import_collada.cpp @@ -31,8 +31,8 @@ #include "editor_import_collada.h" #include "core/os/os.h" -#include "editor/collada/collada.h" #include "editor/editor_node.h" +#include "editor/import/collada.h" #include "scene/3d/camera.h" #include "scene/3d/light.h" #include "scene/3d/mesh_instance.h" |