diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-12 10:37:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-12 10:37:23 +0200 |
| commit | 5bd0ff003fdd82cf84a557251633ebb83bad4fd5 (patch) | |
| tree | 248dc6dfca0e27c3b03533b45753a16d186d2811 /scene/animation | |
| parent | cc71012266f880dcf3b37e40d5f90d9ce8b7a432 (diff) | |
| parent | 277b24dfb7acdb42589b931252bbe7be81c7536e (diff) | |
Merge pull request #21978 from akien-mga/include-core-absolute
Make core/ includes absolute, remove subfolders from include path
Diffstat (limited to 'scene/animation')
| -rw-r--r-- | scene/animation/animation_blend_space_2d.cpp | 2 | ||||
| -rw-r--r-- | scene/animation/animation_player.cpp | 4 | ||||
| -rw-r--r-- | scene/animation/animation_tree.cpp | 3 | ||||
| -rw-r--r-- | scene/animation/tween.cpp | 3 |
4 files changed, 7 insertions, 5 deletions
diff --git a/scene/animation/animation_blend_space_2d.cpp b/scene/animation/animation_blend_space_2d.cpp index f3a76b950e..f5f899a6cd 100644 --- a/scene/animation/animation_blend_space_2d.cpp +++ b/scene/animation/animation_blend_space_2d.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "animation_blend_space_2d.h" -#include "math/delaunay.h" +#include "core/math/delaunay.h" void AnimationNodeBlendSpace2D::get_parameter_list(List<PropertyInfo> *r_list) const { r_list->push_back(PropertyInfo(Variant::VECTOR2, blend_position)); diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp index 460f62f092..2a4d526a7f 100644 --- a/scene/animation/animation_player.cpp +++ b/scene/animation/animation_player.cpp @@ -30,8 +30,8 @@ #include "animation_player.h" -#include "engine.h" -#include "message_queue.h" +#include "core/engine.h" +#include "core/message_queue.h" #include "scene/scene_string_names.h" #include "servers/audio/audio_stream.h" #ifdef TOOLS_ENABLED diff --git a/scene/animation/animation_tree.cpp b/scene/animation/animation_tree.cpp index 9b06d538e9..7a4846e6d5 100644 --- a/scene/animation/animation_tree.cpp +++ b/scene/animation/animation_tree.cpp @@ -29,9 +29,10 @@ /*************************************************************************/ #include "animation_tree.h" + #include "animation_blend_tree.h" +#include "core/engine.h" #include "core/method_bind_ext.gen.inc" -#include "engine.h" #include "scene/scene_string_names.h" #include "servers/audio/audio_stream.h" diff --git a/scene/animation/tween.cpp b/scene/animation/tween.cpp index 58be636e44..074d36f6d9 100644 --- a/scene/animation/tween.cpp +++ b/scene/animation/tween.cpp @@ -29,7 +29,8 @@ /*************************************************************************/ #include "tween.h" -#include "method_bind_ext.gen.inc" + +#include "core/method_bind_ext.gen.inc" void Tween::_add_pending_command(StringName p_key, const Variant &p_arg1, const Variant &p_arg2, const Variant &p_arg3, const Variant &p_arg4, const Variant &p_arg5, const Variant &p_arg6, const Variant &p_arg7, const Variant &p_arg8, const Variant &p_arg9, const Variant &p_arg10) { |