diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2019-11-22 08:58:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-22 08:58:50 +0100 |
commit | 2ea0d79073849e3ecd27d382588955c4fc886c3d (patch) | |
tree | 953952181ba1b46ccafce646774b69dfb06d759a /editor | |
parent | 28613ab8c9f48c5d0cb5c1f23df6d1b662872f51 (diff) | |
parent | c41c24562d4c85c71368d9381fc3046e4d6b7a69 (diff) |
Merge pull request #33810 from akien-mga/codespell
Fix typos with codespell
Diffstat (limited to 'editor')
-rw-r--r-- | editor/import/editor_scene_importer_gltf.cpp | 6 | ||||
-rw-r--r-- | editor/import_dock.cpp | 2 | ||||
-rw-r--r-- | editor/multi_node_edit.cpp | 6 | ||||
-rw-r--r-- | editor/plugins/sprite_frames_editor_plugin.cpp | 2 | ||||
-rw-r--r-- | editor/plugins/texture_region_editor_plugin.cpp | 6 |
5 files changed, 11 insertions, 11 deletions
diff --git a/editor/import/editor_scene_importer_gltf.cpp b/editor/import/editor_scene_importer_gltf.cpp index 10af25bfcf..c7c1cc9708 100644 --- a/editor/import/editor_scene_importer_gltf.cpp +++ b/editor/import/editor_scene_importer_gltf.cpp @@ -1488,15 +1488,15 @@ Error EditorSceneImporterGLTF::_parse_materials(GLTFState &state) { } EditorSceneImporterGLTF::GLTFNodeIndex EditorSceneImporterGLTF::_find_highest_node(GLTFState &state, const Vector<GLTFNodeIndex> &subset) { - int heighest = -1; + int highest = -1; GLTFNodeIndex best_node = -1; for (int i = 0; i < subset.size(); ++i) { const GLTFNodeIndex node_i = subset[i]; const GLTFNode *node = state.nodes[node_i]; - if (heighest == -1 || node->height < heighest) { - heighest = node->height; + if (highest == -1 || node->height < highest) { + highest = node->height; best_node = node_i; } } diff --git a/editor/import_dock.cpp b/editor/import_dock.cpp index 1d72e370b3..947e322075 100644 --- a/editor/import_dock.cpp +++ b/editor/import_dock.cpp @@ -182,7 +182,7 @@ void ImportDock::set_edit_multiple_paths(const Vector<String> &p_paths) { clear(); - //use the value that is repeated the mot + // Use the value that is repeated the most. Map<String, Dictionary> value_frequency; for (int i = 0; i < p_paths.size(); i++) { diff --git a/editor/multi_node_edit.cpp b/editor/multi_node_edit.cpp index 0792d5c95f..e1992b8540 100644 --- a/editor/multi_node_edit.cpp +++ b/editor/multi_node_edit.cpp @@ -122,7 +122,7 @@ void MultiNodeEdit::_get_property_list(List<PropertyInfo> *p_list) const { int nc = 0; - List<PLData *> datas; + List<PLData *> data_list; for (const List<NodePath>::Element *E = nodes.front(); E; E = E->next()) { @@ -145,7 +145,7 @@ void MultiNodeEdit::_get_property_list(List<PropertyInfo> *p_list) const { pld.uses = 0; pld.info = F->get(); usage[F->get().name] = pld; - datas.push_back(usage.getptr(F->get().name)); + data_list.push_back(usage.getptr(F->get().name)); } // Make sure only properties with the same exact PropertyInfo data will appear @@ -156,7 +156,7 @@ void MultiNodeEdit::_get_property_list(List<PropertyInfo> *p_list) const { nc++; } - for (List<PLData *>::Element *E = datas.front(); E; E = E->next()) { + for (List<PLData *>::Element *E = data_list.front(); E; E = E->next()) { if (nc == E->get()->uses) { p_list->push_back(E->get()->info); diff --git a/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/plugins/sprite_frames_editor_plugin.cpp index 394122d91d..34780af59e 100644 --- a/editor/plugins/sprite_frames_editor_plugin.cpp +++ b/editor/plugins/sprite_frames_editor_plugin.cpp @@ -757,7 +757,7 @@ Variant SpriteFramesEditor::get_drag_data_fw(const Point2 &p_point, Control *p_f return Variant(); Dictionary drag_data = EditorNode::get_singleton()->drag_resource(frame, p_from); - drag_data["frame"] = idx; // store the frame, incase we want to reorder frames inside 'drop_data_fw' + drag_data["frame"] = idx; // store the frame, in case we want to reorder frames inside 'drop_data_fw' return drag_data; } diff --git a/editor/plugins/texture_region_editor_plugin.cpp b/editor/plugins/texture_region_editor_plugin.cpp index bda3d142fa..a2f4040152 100644 --- a/editor/plugins/texture_region_editor_plugin.cpp +++ b/editor/plugins/texture_region_editor_plugin.cpp @@ -430,9 +430,9 @@ void TextureRegionEditor::_region_input(const Ref<InputEvent> &p_input) { if (mm->get_button_mask() & BUTTON_MASK_MIDDLE || Input::get_singleton()->is_key_pressed(KEY_SPACE)) { - Vector2 draged(mm->get_relative().x / draw_zoom, mm->get_relative().y / draw_zoom); - hscroll->set_value(hscroll->get_value() - draged.x); - vscroll->set_value(vscroll->get_value() - draged.y); + Vector2 dragged(mm->get_relative().x / draw_zoom, mm->get_relative().y / draw_zoom); + hscroll->set_value(hscroll->get_value() - dragged.x); + vscroll->set_value(vscroll->get_value() - dragged.y); } else if (drag) { |