diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-01 21:29:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-01 21:29:40 +0200 |
| commit | 5a69a663c727a48d38d1ccc66b18318c21b692f3 (patch) | |
| tree | 257ca89ff2af376d375ba6cabe0b97e757734803 | |
| parent | 39621bf6816295ef7b0243ea784f3fdf96257a98 (diff) | |
| parent | 69ccae3d99df8bc6583fa96ae6d9ac57d0e8bf3b (diff) | |
Merge pull request #10864 from Noshyaar/pr-beginning
Fix typo 'begining' to 'beginning'
[ci skip]
| -rw-r--r-- | editor/editor_data.cpp | 2 | ||||
| -rw-r--r-- | editor/editor_data.h | 2 | ||||
| -rw-r--r-- | editor/editor_node.cpp | 2 | ||||
| -rw-r--r-- | servers/visual/shader_language.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp index cb74a7b852..2cb5340b8b 100644 --- a/editor/editor_data.cpp +++ b/editor/editor_data.cpp @@ -141,7 +141,7 @@ ObjectID EditorHistory::get_history_obj(int p_obj) const { return history[p_obj].path[history[p_obj].level].object; } -bool EditorHistory::is_at_begining() const { +bool EditorHistory::is_at_beginning() const { return current <= 0; } bool EditorHistory::is_at_end() const { diff --git a/editor/editor_data.h b/editor/editor_data.h index cbba4d60ad..33a4091a65 100644 --- a/editor/editor_data.h +++ b/editor/editor_data.h @@ -74,7 +74,7 @@ class EditorHistory { void _add_object(ObjectID p_object, const String &p_property, int p_level_change); public: - bool is_at_begining() const; + bool is_at_beginning() const; bool is_at_end() const; void add_object(ObjectID p_object); diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 8575cd164f..e39895e4d8 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -1373,7 +1373,7 @@ void EditorNode::_edit_current() { uint32_t current = editor_history.get_current(); Object *current_obj = current > 0 ? ObjectDB::get_instance(current) : NULL; - property_back->set_disabled(editor_history.is_at_begining()); + property_back->set_disabled(editor_history.is_at_beginning()); property_forward->set_disabled(editor_history.is_at_end()); this->current = current_obj; diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp index d17cf472b3..09f8a3775e 100644 --- a/servers/visual/shader_language.cpp +++ b/servers/visual/shader_language.cpp @@ -3349,7 +3349,7 @@ Error ShaderLanguage::_parse_shader(const Map<StringName, FunctionInfo> &p_funct Token tk = _get_token(); if (tk.type != TK_SHADER_TYPE) { - _set_error("Expected 'shader_type' at the begining of shader."); + _set_error("Expected 'shader_type' at the beginning of shader."); return ERR_PARSE_ERROR; } |