diff --git a/SConstruct b/SConstruct index 9d030f7c1..fd668f534 100644 --- a/SConstruct +++ b/SConstruct @@ -273,7 +273,11 @@ env_base["platform"] = selected_platform # Must always be re-set after calling # Detect modules. modules_detected = OrderedDict() -module_search_paths = ["modules"] # Built-in path. +module_search_paths = [ "modules", methods.convert_custom_modules_path("editor_modules") ] # Built-in path. + +# maybe? +#if env_base["tools"]: +# module_search_paths.append(methods.convert_custom_modules_path("editor_modules")) if env_base["custom_modules"]: paths = env_base["custom_modules"].split(",") diff --git a/modules/etc/SCsub b/editor_modules/etc/SCsub similarity index 100% rename from modules/etc/SCsub rename to editor_modules/etc/SCsub diff --git a/modules/etc/config.py b/editor_modules/etc/config.py similarity index 100% rename from modules/etc/config.py rename to editor_modules/etc/config.py diff --git a/modules/etc/image_compress_etc.cpp b/editor_modules/etc/image_compress_etc.cpp similarity index 100% rename from modules/etc/image_compress_etc.cpp rename to editor_modules/etc/image_compress_etc.cpp diff --git a/modules/etc/image_compress_etc.h b/editor_modules/etc/image_compress_etc.h similarity index 100% rename from modules/etc/image_compress_etc.h rename to editor_modules/etc/image_compress_etc.h diff --git a/modules/etc/register_types.cpp b/editor_modules/etc/register_types.cpp similarity index 100% rename from modules/etc/register_types.cpp rename to editor_modules/etc/register_types.cpp diff --git a/modules/etc/register_types.h b/editor_modules/etc/register_types.h similarity index 100% rename from modules/etc/register_types.h rename to editor_modules/etc/register_types.h diff --git a/modules/etc/texture_loader_pkm.cpp b/editor_modules/etc/texture_loader_pkm.cpp similarity index 100% rename from modules/etc/texture_loader_pkm.cpp rename to editor_modules/etc/texture_loader_pkm.cpp diff --git a/modules/etc/texture_loader_pkm.h b/editor_modules/etc/texture_loader_pkm.h similarity index 100% rename from modules/etc/texture_loader_pkm.h rename to editor_modules/etc/texture_loader_pkm.h diff --git a/modules/gltf/SCsub b/editor_modules/gltf/SCsub similarity index 100% rename from modules/gltf/SCsub rename to editor_modules/gltf/SCsub diff --git a/modules/gltf/config.py b/editor_modules/gltf/config.py similarity index 100% rename from modules/gltf/config.py rename to editor_modules/gltf/config.py diff --git a/modules/gltf/doc_classes/EditorSceneImporterGLTF.xml b/editor_modules/gltf/doc_classes/EditorSceneImporterGLTF.xml similarity index 100% rename from modules/gltf/doc_classes/EditorSceneImporterGLTF.xml rename to editor_modules/gltf/doc_classes/EditorSceneImporterGLTF.xml diff --git a/modules/gltf/doc_classes/GLTFAccessor.xml b/editor_modules/gltf/doc_classes/GLTFAccessor.xml similarity index 100% rename from modules/gltf/doc_classes/GLTFAccessor.xml rename to editor_modules/gltf/doc_classes/GLTFAccessor.xml diff --git a/modules/gltf/doc_classes/GLTFAnimation.xml b/editor_modules/gltf/doc_classes/GLTFAnimation.xml similarity index 100% rename from modules/gltf/doc_classes/GLTFAnimation.xml rename to editor_modules/gltf/doc_classes/GLTFAnimation.xml diff --git a/modules/gltf/doc_classes/GLTFBufferView.xml b/editor_modules/gltf/doc_classes/GLTFBufferView.xml similarity index 100% rename from modules/gltf/doc_classes/GLTFBufferView.xml rename to editor_modules/gltf/doc_classes/GLTFBufferView.xml diff --git a/modules/gltf/doc_classes/GLTFCamera.xml b/editor_modules/gltf/doc_classes/GLTFCamera.xml similarity index 100% rename from modules/gltf/doc_classes/GLTFCamera.xml rename to editor_modules/gltf/doc_classes/GLTFCamera.xml diff --git a/modules/gltf/doc_classes/GLTFDocument.xml b/editor_modules/gltf/doc_classes/GLTFDocument.xml similarity index 100% rename from modules/gltf/doc_classes/GLTFDocument.xml rename to editor_modules/gltf/doc_classes/GLTFDocument.xml diff --git a/modules/gltf/doc_classes/GLTFLight.xml b/editor_modules/gltf/doc_classes/GLTFLight.xml similarity index 100% rename from modules/gltf/doc_classes/GLTFLight.xml rename to editor_modules/gltf/doc_classes/GLTFLight.xml diff --git a/modules/gltf/doc_classes/GLTFMesh.xml b/editor_modules/gltf/doc_classes/GLTFMesh.xml similarity index 100% rename from modules/gltf/doc_classes/GLTFMesh.xml rename to editor_modules/gltf/doc_classes/GLTFMesh.xml diff --git a/modules/gltf/doc_classes/GLTFNode.xml b/editor_modules/gltf/doc_classes/GLTFNode.xml similarity index 100% rename from modules/gltf/doc_classes/GLTFNode.xml rename to editor_modules/gltf/doc_classes/GLTFNode.xml diff --git a/modules/gltf/doc_classes/GLTFSkeleton.xml b/editor_modules/gltf/doc_classes/GLTFSkeleton.xml similarity index 100% rename from modules/gltf/doc_classes/GLTFSkeleton.xml rename to editor_modules/gltf/doc_classes/GLTFSkeleton.xml diff --git a/modules/gltf/doc_classes/GLTFSkin.xml b/editor_modules/gltf/doc_classes/GLTFSkin.xml similarity index 100% rename from modules/gltf/doc_classes/GLTFSkin.xml rename to editor_modules/gltf/doc_classes/GLTFSkin.xml diff --git a/modules/gltf/doc_classes/GLTFSpecGloss.xml b/editor_modules/gltf/doc_classes/GLTFSpecGloss.xml similarity index 100% rename from modules/gltf/doc_classes/GLTFSpecGloss.xml rename to editor_modules/gltf/doc_classes/GLTFSpecGloss.xml diff --git a/modules/gltf/doc_classes/GLTFState.xml b/editor_modules/gltf/doc_classes/GLTFState.xml similarity index 100% rename from modules/gltf/doc_classes/GLTFState.xml rename to editor_modules/gltf/doc_classes/GLTFState.xml diff --git a/modules/gltf/doc_classes/GLTFTexture.xml b/editor_modules/gltf/doc_classes/GLTFTexture.xml similarity index 100% rename from modules/gltf/doc_classes/GLTFTexture.xml rename to editor_modules/gltf/doc_classes/GLTFTexture.xml diff --git a/modules/gltf/doc_classes/PackedSceneGLTF.xml b/editor_modules/gltf/doc_classes/PackedSceneGLTF.xml similarity index 100% rename from modules/gltf/doc_classes/PackedSceneGLTF.xml rename to editor_modules/gltf/doc_classes/PackedSceneGLTF.xml diff --git a/modules/gltf/editor_scene_exporter_gltf_plugin.cpp b/editor_modules/gltf/editor_scene_exporter_gltf_plugin.cpp similarity index 100% rename from modules/gltf/editor_scene_exporter_gltf_plugin.cpp rename to editor_modules/gltf/editor_scene_exporter_gltf_plugin.cpp diff --git a/modules/gltf/editor_scene_exporter_gltf_plugin.h b/editor_modules/gltf/editor_scene_exporter_gltf_plugin.h similarity index 100% rename from modules/gltf/editor_scene_exporter_gltf_plugin.h rename to editor_modules/gltf/editor_scene_exporter_gltf_plugin.h diff --git a/modules/gltf/editor_scene_importer_gltf.cpp b/editor_modules/gltf/editor_scene_importer_gltf.cpp similarity index 100% rename from modules/gltf/editor_scene_importer_gltf.cpp rename to editor_modules/gltf/editor_scene_importer_gltf.cpp diff --git a/modules/gltf/editor_scene_importer_gltf.h b/editor_modules/gltf/editor_scene_importer_gltf.h similarity index 100% rename from modules/gltf/editor_scene_importer_gltf.h rename to editor_modules/gltf/editor_scene_importer_gltf.h diff --git a/modules/gltf/gltf_accessor.cpp b/editor_modules/gltf/gltf_accessor.cpp similarity index 100% rename from modules/gltf/gltf_accessor.cpp rename to editor_modules/gltf/gltf_accessor.cpp diff --git a/modules/gltf/gltf_accessor.h b/editor_modules/gltf/gltf_accessor.h similarity index 100% rename from modules/gltf/gltf_accessor.h rename to editor_modules/gltf/gltf_accessor.h diff --git a/modules/gltf/gltf_animation.cpp b/editor_modules/gltf/gltf_animation.cpp similarity index 100% rename from modules/gltf/gltf_animation.cpp rename to editor_modules/gltf/gltf_animation.cpp diff --git a/modules/gltf/gltf_animation.h b/editor_modules/gltf/gltf_animation.h similarity index 100% rename from modules/gltf/gltf_animation.h rename to editor_modules/gltf/gltf_animation.h diff --git a/modules/gltf/gltf_buffer_view.cpp b/editor_modules/gltf/gltf_buffer_view.cpp similarity index 100% rename from modules/gltf/gltf_buffer_view.cpp rename to editor_modules/gltf/gltf_buffer_view.cpp diff --git a/modules/gltf/gltf_buffer_view.h b/editor_modules/gltf/gltf_buffer_view.h similarity index 100% rename from modules/gltf/gltf_buffer_view.h rename to editor_modules/gltf/gltf_buffer_view.h diff --git a/modules/gltf/gltf_camera.cpp b/editor_modules/gltf/gltf_camera.cpp similarity index 100% rename from modules/gltf/gltf_camera.cpp rename to editor_modules/gltf/gltf_camera.cpp diff --git a/modules/gltf/gltf_camera.h b/editor_modules/gltf/gltf_camera.h similarity index 100% rename from modules/gltf/gltf_camera.h rename to editor_modules/gltf/gltf_camera.h diff --git a/modules/gltf/gltf_document.cpp b/editor_modules/gltf/gltf_document.cpp similarity index 100% rename from modules/gltf/gltf_document.cpp rename to editor_modules/gltf/gltf_document.cpp diff --git a/modules/gltf/gltf_document.h b/editor_modules/gltf/gltf_document.h similarity index 100% rename from modules/gltf/gltf_document.h rename to editor_modules/gltf/gltf_document.h diff --git a/modules/gltf/gltf_light.cpp b/editor_modules/gltf/gltf_light.cpp similarity index 100% rename from modules/gltf/gltf_light.cpp rename to editor_modules/gltf/gltf_light.cpp diff --git a/modules/gltf/gltf_light.h b/editor_modules/gltf/gltf_light.h similarity index 100% rename from modules/gltf/gltf_light.h rename to editor_modules/gltf/gltf_light.h diff --git a/modules/gltf/gltf_mesh.cpp b/editor_modules/gltf/gltf_mesh.cpp similarity index 100% rename from modules/gltf/gltf_mesh.cpp rename to editor_modules/gltf/gltf_mesh.cpp diff --git a/modules/gltf/gltf_mesh.h b/editor_modules/gltf/gltf_mesh.h similarity index 100% rename from modules/gltf/gltf_mesh.h rename to editor_modules/gltf/gltf_mesh.h diff --git a/modules/gltf/gltf_node.cpp b/editor_modules/gltf/gltf_node.cpp similarity index 100% rename from modules/gltf/gltf_node.cpp rename to editor_modules/gltf/gltf_node.cpp diff --git a/modules/gltf/gltf_node.h b/editor_modules/gltf/gltf_node.h similarity index 100% rename from modules/gltf/gltf_node.h rename to editor_modules/gltf/gltf_node.h diff --git a/modules/gltf/gltf_skeleton.cpp b/editor_modules/gltf/gltf_skeleton.cpp similarity index 100% rename from modules/gltf/gltf_skeleton.cpp rename to editor_modules/gltf/gltf_skeleton.cpp diff --git a/modules/gltf/gltf_skeleton.h b/editor_modules/gltf/gltf_skeleton.h similarity index 100% rename from modules/gltf/gltf_skeleton.h rename to editor_modules/gltf/gltf_skeleton.h diff --git a/modules/gltf/gltf_skin.cpp b/editor_modules/gltf/gltf_skin.cpp similarity index 100% rename from modules/gltf/gltf_skin.cpp rename to editor_modules/gltf/gltf_skin.cpp diff --git a/modules/gltf/gltf_skin.h b/editor_modules/gltf/gltf_skin.h similarity index 100% rename from modules/gltf/gltf_skin.h rename to editor_modules/gltf/gltf_skin.h diff --git a/modules/gltf/gltf_spec_gloss.cpp b/editor_modules/gltf/gltf_spec_gloss.cpp similarity index 100% rename from modules/gltf/gltf_spec_gloss.cpp rename to editor_modules/gltf/gltf_spec_gloss.cpp diff --git a/modules/gltf/gltf_spec_gloss.h b/editor_modules/gltf/gltf_spec_gloss.h similarity index 100% rename from modules/gltf/gltf_spec_gloss.h rename to editor_modules/gltf/gltf_spec_gloss.h diff --git a/modules/gltf/gltf_state.cpp b/editor_modules/gltf/gltf_state.cpp similarity index 100% rename from modules/gltf/gltf_state.cpp rename to editor_modules/gltf/gltf_state.cpp diff --git a/modules/gltf/gltf_state.h b/editor_modules/gltf/gltf_state.h similarity index 100% rename from modules/gltf/gltf_state.h rename to editor_modules/gltf/gltf_state.h diff --git a/modules/gltf/gltf_texture.cpp b/editor_modules/gltf/gltf_texture.cpp similarity index 100% rename from modules/gltf/gltf_texture.cpp rename to editor_modules/gltf/gltf_texture.cpp diff --git a/modules/gltf/gltf_texture.h b/editor_modules/gltf/gltf_texture.h similarity index 100% rename from modules/gltf/gltf_texture.h rename to editor_modules/gltf/gltf_texture.h diff --git a/modules/gltf/packed_scene_gltf.cpp b/editor_modules/gltf/packed_scene_gltf.cpp similarity index 100% rename from modules/gltf/packed_scene_gltf.cpp rename to editor_modules/gltf/packed_scene_gltf.cpp diff --git a/modules/gltf/packed_scene_gltf.h b/editor_modules/gltf/packed_scene_gltf.h similarity index 100% rename from modules/gltf/packed_scene_gltf.h rename to editor_modules/gltf/packed_scene_gltf.h diff --git a/modules/gltf/register_types.cpp b/editor_modules/gltf/register_types.cpp similarity index 100% rename from modules/gltf/register_types.cpp rename to editor_modules/gltf/register_types.cpp diff --git a/modules/gltf/register_types.h b/editor_modules/gltf/register_types.h similarity index 100% rename from modules/gltf/register_types.h rename to editor_modules/gltf/register_types.h diff --git a/modules/plugin_refresher/SCsub b/editor_modules/plugin_refresher/SCsub similarity index 100% rename from modules/plugin_refresher/SCsub rename to editor_modules/plugin_refresher/SCsub diff --git a/modules/plugin_refresher/config.py b/editor_modules/plugin_refresher/config.py similarity index 87% rename from modules/plugin_refresher/config.py rename to editor_modules/plugin_refresher/config.py index 631a3b44c..8699a0b70 100644 --- a/modules/plugin_refresher/config.py +++ b/editor_modules/plugin_refresher/config.py @@ -1,7 +1,7 @@ def can_build(env, platform): - return True + return env["tools"] def configure(env): diff --git a/modules/plugin_refresher/plugin_refresher.cpp b/editor_modules/plugin_refresher/plugin_refresher.cpp similarity index 100% rename from modules/plugin_refresher/plugin_refresher.cpp rename to editor_modules/plugin_refresher/plugin_refresher.cpp diff --git a/modules/plugin_refresher/plugin_refresher.h b/editor_modules/plugin_refresher/plugin_refresher.h similarity index 100% rename from modules/plugin_refresher/plugin_refresher.h rename to editor_modules/plugin_refresher/plugin_refresher.h diff --git a/modules/plugin_refresher/plugin_refresher_editor_plugin.cpp b/editor_modules/plugin_refresher/plugin_refresher_editor_plugin.cpp similarity index 100% rename from modules/plugin_refresher/plugin_refresher_editor_plugin.cpp rename to editor_modules/plugin_refresher/plugin_refresher_editor_plugin.cpp diff --git a/modules/plugin_refresher/plugin_refresher_editor_plugin.h b/editor_modules/plugin_refresher/plugin_refresher_editor_plugin.h similarity index 100% rename from modules/plugin_refresher/plugin_refresher_editor_plugin.h rename to editor_modules/plugin_refresher/plugin_refresher_editor_plugin.h diff --git a/modules/plugin_refresher/register_types.cpp b/editor_modules/plugin_refresher/register_types.cpp similarity index 100% rename from modules/plugin_refresher/register_types.cpp rename to editor_modules/plugin_refresher/register_types.cpp diff --git a/modules/plugin_refresher/register_types.h b/editor_modules/plugin_refresher/register_types.h similarity index 100% rename from modules/plugin_refresher/register_types.h rename to editor_modules/plugin_refresher/register_types.h diff --git a/modules/skeleton_editor/.gitignore b/editor_modules/skeleton_editor/.gitignore similarity index 100% rename from modules/skeleton_editor/.gitignore rename to editor_modules/skeleton_editor/.gitignore diff --git a/modules/skeleton_editor/SCsub b/editor_modules/skeleton_editor/SCsub similarity index 100% rename from modules/skeleton_editor/SCsub rename to editor_modules/skeleton_editor/SCsub diff --git a/modules/skeleton_editor/config.py b/editor_modules/skeleton_editor/config.py similarity index 86% rename from modules/skeleton_editor/config.py rename to editor_modules/skeleton_editor/config.py index 38c998d54..a8a3fb371 100644 --- a/modules/skeleton_editor/config.py +++ b/editor_modules/skeleton_editor/config.py @@ -1,6 +1,6 @@ def can_build(env, platform): - return True + return env["tools"] def configure(env): pass diff --git a/modules/skeleton_editor/icons/icon_editor_bone_handle.svg b/editor_modules/skeleton_editor/icons/icon_editor_bone_handle.svg similarity index 100% rename from modules/skeleton_editor/icons/icon_editor_bone_handle.svg rename to editor_modules/skeleton_editor/icons/icon_editor_bone_handle.svg diff --git a/modules/skeleton_editor/icons/icon_tool_bone_move.svg b/editor_modules/skeleton_editor/icons/icon_tool_bone_move.svg similarity index 100% rename from modules/skeleton_editor/icons/icon_tool_bone_move.svg rename to editor_modules/skeleton_editor/icons/icon_tool_bone_move.svg diff --git a/modules/skeleton_editor/icons/icon_tool_bone_rest.svg b/editor_modules/skeleton_editor/icons/icon_tool_bone_rest.svg similarity index 100% rename from modules/skeleton_editor/icons/icon_tool_bone_rest.svg rename to editor_modules/skeleton_editor/icons/icon_tool_bone_rest.svg diff --git a/modules/skeleton_editor/icons/icon_tool_bone_rotate.svg b/editor_modules/skeleton_editor/icons/icon_tool_bone_rotate.svg similarity index 100% rename from modules/skeleton_editor/icons/icon_tool_bone_rotate.svg rename to editor_modules/skeleton_editor/icons/icon_tool_bone_rotate.svg diff --git a/modules/skeleton_editor/icons/icon_tool_bone_scale.svg b/editor_modules/skeleton_editor/icons/icon_tool_bone_scale.svg similarity index 100% rename from modules/skeleton_editor/icons/icon_tool_bone_scale.svg rename to editor_modules/skeleton_editor/icons/icon_tool_bone_scale.svg diff --git a/modules/skeleton_editor/icons/icon_tool_bone_select.svg b/editor_modules/skeleton_editor/icons/icon_tool_bone_select.svg similarity index 100% rename from modules/skeleton_editor/icons/icon_tool_bone_select.svg rename to editor_modules/skeleton_editor/icons/icon_tool_bone_select.svg diff --git a/modules/skeleton_editor/register_types.cpp b/editor_modules/skeleton_editor/register_types.cpp similarity index 100% rename from modules/skeleton_editor/register_types.cpp rename to editor_modules/skeleton_editor/register_types.cpp diff --git a/modules/skeleton_editor/register_types.h b/editor_modules/skeleton_editor/register_types.h similarity index 100% rename from modules/skeleton_editor/register_types.h rename to editor_modules/skeleton_editor/register_types.h diff --git a/modules/skeleton_editor/skeleton_editor_plugin.cpp b/editor_modules/skeleton_editor/skeleton_editor_plugin.cpp similarity index 100% rename from modules/skeleton_editor/skeleton_editor_plugin.cpp rename to editor_modules/skeleton_editor/skeleton_editor_plugin.cpp diff --git a/modules/skeleton_editor/skeleton_editor_plugin.h b/editor_modules/skeleton_editor/skeleton_editor_plugin.h similarity index 100% rename from modules/skeleton_editor/skeleton_editor_plugin.h rename to editor_modules/skeleton_editor/skeleton_editor_plugin.h diff --git a/modules/text_editor/LICENSE b/editor_modules/text_editor/LICENSE similarity index 100% rename from modules/text_editor/LICENSE rename to editor_modules/text_editor/LICENSE diff --git a/modules/text_editor/README.md b/editor_modules/text_editor/README.md similarity index 100% rename from modules/text_editor/README.md rename to editor_modules/text_editor/README.md diff --git a/modules/text_editor/SCsub b/editor_modules/text_editor/SCsub similarity index 100% rename from modules/text_editor/SCsub rename to editor_modules/text_editor/SCsub diff --git a/modules/text_editor/config.py b/editor_modules/text_editor/config.py similarity index 84% rename from modules/text_editor/config.py rename to editor_modules/text_editor/config.py index d4c78d93b..3ad711549 100644 --- a/modules/text_editor/config.py +++ b/editor_modules/text_editor/config.py @@ -1,6 +1,9 @@ def can_build(env, platform): + if not env["tools"]: + return False + env.module_add_dependencies("text_editor", ["freetype"], True) return True diff --git a/modules/text_editor/icons/icon_text_editor_file.svg b/editor_modules/text_editor/icons/icon_text_editor_file.svg similarity index 100% rename from modules/text_editor/icons/icon_text_editor_file.svg rename to editor_modules/text_editor/icons/icon_text_editor_file.svg diff --git a/modules/text_editor/register_types.cpp b/editor_modules/text_editor/register_types.cpp similarity index 100% rename from modules/text_editor/register_types.cpp rename to editor_modules/text_editor/register_types.cpp diff --git a/modules/text_editor/register_types.h b/editor_modules/text_editor/register_types.h similarity index 100% rename from modules/text_editor/register_types.h rename to editor_modules/text_editor/register_types.h diff --git a/modules/text_editor/text_editor_file.cpp b/editor_modules/text_editor/text_editor_file.cpp similarity index 100% rename from modules/text_editor/text_editor_file.cpp rename to editor_modules/text_editor/text_editor_file.cpp diff --git a/modules/text_editor/text_editor_file.h b/editor_modules/text_editor/text_editor_file.h similarity index 100% rename from modules/text_editor/text_editor_file.h rename to editor_modules/text_editor/text_editor_file.h diff --git a/modules/text_editor/text_editor_format_loader.cpp b/editor_modules/text_editor/text_editor_format_loader.cpp similarity index 100% rename from modules/text_editor/text_editor_format_loader.cpp rename to editor_modules/text_editor/text_editor_format_loader.cpp diff --git a/modules/text_editor/text_editor_format_loader.h b/editor_modules/text_editor/text_editor_format_loader.h similarity index 100% rename from modules/text_editor/text_editor_format_loader.h rename to editor_modules/text_editor/text_editor_format_loader.h diff --git a/modules/text_editor/text_editor_plugin.cpp b/editor_modules/text_editor/text_editor_plugin.cpp similarity index 100% rename from modules/text_editor/text_editor_plugin.cpp rename to editor_modules/text_editor/text_editor_plugin.cpp diff --git a/modules/text_editor/text_editor_plugin.h b/editor_modules/text_editor/text_editor_plugin.h similarity index 100% rename from modules/text_editor/text_editor_plugin.h rename to editor_modules/text_editor/text_editor_plugin.h diff --git a/modules/text_editor/text_editor_preview.cpp b/editor_modules/text_editor/text_editor_preview.cpp similarity index 100% rename from modules/text_editor/text_editor_preview.cpp rename to editor_modules/text_editor/text_editor_preview.cpp diff --git a/modules/text_editor/text_editor_preview.h b/editor_modules/text_editor/text_editor_preview.h similarity index 100% rename from modules/text_editor/text_editor_preview.h rename to editor_modules/text_editor/text_editor_preview.h diff --git a/modules/text_editor/text_editor_settings.cpp b/editor_modules/text_editor/text_editor_settings.cpp similarity index 100% rename from modules/text_editor/text_editor_settings.cpp rename to editor_modules/text_editor/text_editor_settings.cpp diff --git a/modules/text_editor/text_editor_settings.h b/editor_modules/text_editor/text_editor_settings.h similarity index 100% rename from modules/text_editor/text_editor_settings.h rename to editor_modules/text_editor/text_editor_settings.h diff --git a/modules/text_editor/text_editor_vanilla_editor.cpp b/editor_modules/text_editor/text_editor_vanilla_editor.cpp similarity index 100% rename from modules/text_editor/text_editor_vanilla_editor.cpp rename to editor_modules/text_editor/text_editor_vanilla_editor.cpp diff --git a/modules/text_editor/text_editor_vanilla_editor.h b/editor_modules/text_editor/text_editor_vanilla_editor.h similarity index 100% rename from modules/text_editor/text_editor_vanilla_editor.h rename to editor_modules/text_editor/text_editor_vanilla_editor.h diff --git a/modules/text_editor/text_file_editor.cpp b/editor_modules/text_editor/text_file_editor.cpp similarity index 100% rename from modules/text_editor/text_file_editor.cpp rename to editor_modules/text_editor/text_file_editor.cpp diff --git a/modules/text_editor/text_file_editor.h b/editor_modules/text_editor/text_file_editor.h similarity index 100% rename from modules/text_editor/text_file_editor.h rename to editor_modules/text_editor/text_file_editor.h diff --git a/modules/tinyexr/SCsub b/editor_modules/tinyexr/SCsub similarity index 100% rename from modules/tinyexr/SCsub rename to editor_modules/tinyexr/SCsub diff --git a/modules/tinyexr/config.py b/editor_modules/tinyexr/config.py similarity index 100% rename from modules/tinyexr/config.py rename to editor_modules/tinyexr/config.py diff --git a/modules/tinyexr/image_loader_tinyexr.cpp b/editor_modules/tinyexr/image_loader_tinyexr.cpp similarity index 100% rename from modules/tinyexr/image_loader_tinyexr.cpp rename to editor_modules/tinyexr/image_loader_tinyexr.cpp diff --git a/modules/tinyexr/image_loader_tinyexr.h b/editor_modules/tinyexr/image_loader_tinyexr.h similarity index 100% rename from modules/tinyexr/image_loader_tinyexr.h rename to editor_modules/tinyexr/image_loader_tinyexr.h diff --git a/modules/tinyexr/image_saver_tinyexr.cpp b/editor_modules/tinyexr/image_saver_tinyexr.cpp similarity index 100% rename from modules/tinyexr/image_saver_tinyexr.cpp rename to editor_modules/tinyexr/image_saver_tinyexr.cpp diff --git a/modules/tinyexr/image_saver_tinyexr.h b/editor_modules/tinyexr/image_saver_tinyexr.h similarity index 100% rename from modules/tinyexr/image_saver_tinyexr.h rename to editor_modules/tinyexr/image_saver_tinyexr.h diff --git a/modules/tinyexr/register_types.cpp b/editor_modules/tinyexr/register_types.cpp similarity index 100% rename from modules/tinyexr/register_types.cpp rename to editor_modules/tinyexr/register_types.cpp diff --git a/modules/tinyexr/register_types.h b/editor_modules/tinyexr/register_types.h similarity index 100% rename from modules/tinyexr/register_types.h rename to editor_modules/tinyexr/register_types.h diff --git a/modules/mesh_data_resource/plugin_gltf/editor_import_gltf_mdr.h b/modules/mesh_data_resource/plugin_gltf/editor_import_gltf_mdr.h index 34b605d5e..d67146ca1 100644 --- a/modules/mesh_data_resource/plugin_gltf/editor_import_gltf_mdr.h +++ b/modules/mesh_data_resource/plugin_gltf/editor_import_gltf_mdr.h @@ -37,7 +37,7 @@ SOFTWARE. #include "core/math/transform.h" -#include "../../gltf/editor_scene_importer_gltf.h" +#include "gltf/editor_scene_importer_gltf.h" #include "scene/3d/mesh_instance.h" class EditorImportGLTFMdr : public MDRImportPluginBase {