diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-17 08:42:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-17 08:42:39 +0100 |
| commit | b8577ecce1bb62a4a589d02bdd71b701e5bdea81 (patch) | |
| tree | 6bb58135d05206e31bd597d69ae10889fcf23e85 /scene/animation | |
| parent | 2658ccb85fd8ddc67d3b4639f7f4886560ff98f8 (diff) | |
| parent | cb282c6ef0bb91957f8a6f422705813bd47c788c (diff) | |
Merge pull request #37106 from akien-mga/clang-format-cpp11
Style: Set clang-format Standard to Cpp11
Diffstat (limited to 'scene/animation')
| -rw-r--r-- | scene/animation/animation_tree.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/animation/animation_tree.h b/scene/animation/animation_tree.h index 8769e2c61d..742942fcda 100644 --- a/scene/animation/animation_tree.h +++ b/scene/animation/animation_tree.h @@ -285,7 +285,7 @@ private: void _tree_changed(); void _update_properties(); List<PropertyInfo> properties; - HashMap<StringName, HashMap<StringName, StringName> > property_parent_map; + HashMap<StringName, HashMap<StringName, StringName>> property_parent_map; HashMap<StringName, Variant> property_map; struct Activity { @@ -293,7 +293,7 @@ private: float activity; }; - HashMap<StringName, Vector<Activity> > input_activity_map; + HashMap<StringName, Vector<Activity>> input_activity_map; HashMap<StringName, Vector<Activity> *> input_activity_map_get; void _update_properties_for_node(const String &p_base_path, Ref<AnimationNode> node); |