diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-01-29 13:46:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-29 13:46:38 +0100 |
| commit | 2f57a11ed9b383706b72783c0d9b1e869774e08a (patch) | |
| tree | 1b2b19bbc51b9b6ee71b3d7599092bdaa7b6dbee /editor | |
| parent | 9467350f37089eb3f4ef7de683daba28b0c69dec (diff) | |
| parent | 8a0a3acceee804b91afe31022cf0310c01162f73 (diff) | |
Merge pull request #55785 from nathanfranke/clang-tidy
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/debugger/editor_profiler.cpp | 3 | ||||
| -rw-r--r-- | editor/import/collada.cpp | 3 | ||||
| -rw-r--r-- | editor/plugins/animation_blend_tree_editor_plugin.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/editor/debugger/editor_profiler.cpp b/editor/debugger/editor_profiler.cpp index d5e825a26c..da1d6a54f2 100644 --- a/editor/debugger/editor_profiler.cpp +++ b/editor/debugger/editor_profiler.cpp @@ -456,8 +456,9 @@ void EditorProfiler::_graph_tex_input(const Ref<InputEvent> &p_ev) { if (mb.is_valid() || (mm->get_button_mask() & MouseButton::MASK_LEFT) != MouseButton::NONE) { updating_frame = true; - if (x < total_metrics) + if (x < total_metrics) { cursor_metric_edit->set_value(_get_frame_metric(x).frame_number); + } updating_frame = false; if (activate->is_pressed()) { diff --git a/editor/import/collada.cpp b/editor/import/collada.cpp index 2cc534d96d..b40a810763 100644 --- a/editor/import/collada.cpp +++ b/editor/import/collada.cpp @@ -411,8 +411,9 @@ Vector<String> Collada::_read_string_array(XMLParser &parser) { } Transform3D Collada::_read_transform(XMLParser &parser) { - if (parser.is_empty()) + if (parser.is_empty()) { return Transform3D(); + } Vector<String> array; while (parser.read() == OK) { diff --git a/editor/plugins/animation_blend_tree_editor_plugin.h b/editor/plugins/animation_blend_tree_editor_plugin.h index 8e63e39fd5..1e55cc8598 100644 --- a/editor/plugins/animation_blend_tree_editor_plugin.h +++ b/editor/plugins/animation_blend_tree_editor_plugin.h @@ -75,7 +75,7 @@ class AnimationNodeBlendTreeEditor : public AnimationTreeNodeEditorPlugin { String type; Ref<Script> script; int input_port_count; - AddOption(const String &p_name = String(), const String &p_type = String(), bool p_input_port_count = 0) : + AddOption(const String &p_name = String(), const String &p_type = String(), int p_input_port_count = 0) : name(p_name), type(p_type), input_port_count(p_input_port_count) { |