diff --git a/editor/animation_bezier_editor.h b/editor/animation_bezier_editor.h index ca2ce6647..f16a2a049 100644 --- a/editor/animation_bezier_editor.h +++ b/editor/animation_bezier_editor.h @@ -42,7 +42,7 @@ #include "core/variant/variant.h" #include "core/containers/vector.h" -#include "scene/resources/animation.h" +#include "scene/animation/animation.h" #include "scene/resources/texture.h" class AnimationTimelineEdit; diff --git a/editor/animation_track_editor.h b/editor/animation_track_editor.h index 9a44bef1f..a439db781 100644 --- a/editor/animation_track_editor.h +++ b/editor/animation_track_editor.h @@ -47,7 +47,7 @@ #include "core/string/ustring.h" #include "core/variant/variant.h" #include "core/containers/vector.h" -#include "scene/resources/animation.h" +#include "scene/animation/animation.h" #include "scene/resources/texture.h" class AnimationTrackEdit; diff --git a/editor/animation_track_editor_plugins.cpp b/editor/animation_track_editor_plugins.cpp index 394913e2b..d688a705b 100644 --- a/editor/animation_track_editor_plugins.cpp +++ b/editor/animation_track_editor_plugins.cpp @@ -50,7 +50,7 @@ #include "core/typedefs.h" #include "core/object/undo_redo.h" #include "core/containers/vector.h" -#include "scene/resources/animation.h" +#include "scene/animation/animation.h" #include "scene/resources/font.h" #include "servers/rendering_server.h" diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp index cf7f25417..f416ca81a 100644 --- a/editor/import/resource_importer_scene.cpp +++ b/editor/import/resource_importer_scene.cpp @@ -40,7 +40,7 @@ #include "scene/3d/physics_body.h" #include "scene/3d/vehicle_body.h" #include "scene/animation/animation_player.h" -#include "scene/resources/animation.h" +#include "scene/animation/animation.h" #include "scene/resources/box_shape.h" #include "scene/resources/mesh.h" #include "scene/resources/navigation_mesh.h" diff --git a/editor/plugins/animation_blend_tree_editor_plugin.cpp b/editor/plugins/animation_blend_tree_editor_plugin.cpp index c456da9bc..a2574a9b6 100644 --- a/editor/plugins/animation_blend_tree_editor_plugin.cpp +++ b/editor/plugins/animation_blend_tree_editor_plugin.cpp @@ -66,7 +66,7 @@ #include "scene/gui/separator.h" #include "scene/gui/tree.h" #include "scene/main/node.h" -#include "scene/resources/animation.h" +#include "scene/animation/animation.h" #include "scene/resources/style_box.h" #include "modules/modules_enabled.gen.h" diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index 7e3465e02..3fc04a204 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -79,7 +79,7 @@ #include "scene/main/node.h" #include "scene/main/scene_tree.h" #include "scene/main/viewport.h" -#include "scene/resources/animation.h" +#include "scene/animation/animation.h" #include "scene/resources/texture.h" #include "servers/rendering_server.h" diff --git a/editor/plugins/root_motion_editor_plugin.cpp b/editor/plugins/root_motion_editor_plugin.cpp index 3d7f94e56..18647bb7d 100644 --- a/editor/plugins/root_motion_editor_plugin.cpp +++ b/editor/plugins/root_motion_editor_plugin.cpp @@ -50,7 +50,7 @@ #include "scene/main/node.h" #include "scene/main/scene_tree.h" #include "scene/main/viewport.h" -#include "scene/resources/animation.h" +#include "scene/animation/animation.h" #include "scene/resources/texture.h" #include "modules/modules_enabled.gen.h" diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 7fd932d25..d20f80189 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -92,7 +92,7 @@ #include "scene/main/scene_tree.h" #include "scene/main/viewport.h" #include "scene/property_utils.h" -#include "scene/resources/animation.h" +#include "scene/animation/animation.h" #include "scene/resources/packed_scene.h" #include "scene/resources/texture.h" diff --git a/editor_modules/gltf/editor_scene_importer_gltf.cpp b/editor_modules/gltf/editor_scene_importer_gltf.cpp index db2074a88..08219cac2 100644 --- a/editor_modules/gltf/editor_scene_importer_gltf.cpp +++ b/editor_modules/gltf/editor_scene_importer_gltf.cpp @@ -31,7 +31,7 @@ #ifdef TOOLS_ENABLED #include "editor_scene_importer_gltf.h" -#include "scene/resources/animation.h" +#include "scene/animation/animation.h" #include "gltf_state.h" #include "packed_scene_gltf.h" diff --git a/editor_modules/gltf/gltf_document.cpp b/editor_modules/gltf/gltf_document.cpp index a2d5816db..cd30b12ce 100644 --- a/editor_modules/gltf/gltf_document.cpp +++ b/editor_modules/gltf/gltf_document.cpp @@ -56,7 +56,7 @@ #include "scene/3d/spatial.h" #include "scene/animation/animation_player.h" #include "scene/main/node.h" -#include "scene/resources/animation.h" +#include "scene/animation/animation.h" #include "scene/resources/multimesh.h" #include "scene/resources/surface_tool.h" diff --git a/scene/resources/animation.cpp b/scene/animation/animation.cpp similarity index 100% rename from scene/resources/animation.cpp rename to scene/animation/animation.cpp diff --git a/scene/resources/animation.h b/scene/animation/animation.h similarity index 100% rename from scene/resources/animation.h rename to scene/animation/animation.h diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp index dbc0148bd..087a28bb2 100644 --- a/scene/animation/animation_player.cpp +++ b/scene/animation/animation_player.cpp @@ -34,7 +34,7 @@ #include "core/object/message_queue.h" #include "scene/2d/node_2d.h" #include "scene/3d/spatial.h" -#include "scene/resources/animation.h" +#include "scene/animation/animation.h" #include "scene/scene_string_names.h" #include "servers/audio/audio_stream.h" diff --git a/scene/animation/animation_tree.h b/scene/animation/animation_tree.h index 2fbbb46fe..b9427bc67 100644 --- a/scene/animation/animation_tree.h +++ b/scene/animation/animation_tree.h @@ -32,7 +32,7 @@ #include "core/object/resource.h" #include "scene/main/node.h" -#include "scene/resources/animation.h" +#include "scene/animation/animation.h" #include "modules/modules_enabled.gen.h"