asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #10864 from Noshyaar/pr-beginning

Browse source 
Fix typo 'begining' to 'beginning'

[ci skip]
This commit is contained in:
Rémi Verschelde 2017-09-01 21:29:40 +02:00 committed by GitHub
commit 5a69a663c7
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
editor/editor_data.cpp
View file

@ -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 {

2
editor/editor_data.h
View file

@ -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);

2
editor/editor_node.cpp
View file

@ -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;

2
servers/visual/shader_language.cpp
View file

@ -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;
}