diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-06-24 00:07:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-24 00:07:13 +0200 |
| commit | 297e7efa0af0765b3030dce726e54dde0b37f95c (patch) | |
| tree | 834c0f9360720a5cc6a9e0eb5055b1513f8f5a24 /editor/animation_track_editor.h | |
| parent | 30383a1cdc00d398349515b81a85fa1d3da7ae37 (diff) | |
| parent | b3d772ed837c57d590c064f9de4e2ea89eb55001 (diff) | |
Merge pull request #30011 from akien-mga/animation-invalid-key
Display invalid value keys in AnimationTrackEdit
Diffstat (limited to 'editor/animation_track_editor.h')
| -rw-r--r-- | editor/animation_track_editor.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/editor/animation_track_editor.h b/editor/animation_track_editor.h index 1452d5519c..5f05c1de8c 100644 --- a/editor/animation_track_editor.h +++ b/editor/animation_track_editor.h @@ -31,6 +31,11 @@ #ifndef ANIMATION_TRACK_EDITOR_H #define ANIMATION_TRACK_EDITOR_H +#include "editor/editor_data.h" +#include "editor/editor_spin_slider.h" +#include "editor/property_editor.h" +#include "editor/property_selector.h" +#include "scene/animation/animation_cache.h" #include "scene/gui/control.h" #include "scene/gui/file_dialog.h" #include "scene/gui/menu_button.h" @@ -40,12 +45,6 @@ #include "scene/gui/tab_container.h" #include "scene/gui/texture_rect.h" #include "scene/gui/tool_button.h" - -#include "editor/property_selector.h" -#include "editor_data.h" -#include "editor_spin_slider.h" -#include "property_editor.h" -#include "scene/animation/animation_cache.h" #include "scene/resources/animation.h" #include "scene_tree_editor.h" @@ -175,8 +174,9 @@ class AnimationTrackEdit : public Control { void _path_entered(const String &p_text); void _play_position_draw(); - mutable int dropping_at; + bool _is_value_key_valid(const Variant &p_key_value, Variant::Type &r_valid_type) const; + mutable int dropping_at; float insert_at_pos; bool moving_selection_attempt; int select_single_attempt; |