Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/io/resource_loader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ void ResourceLoader::_run_load_task(void *p_userdata) {

if (should_yield) {
// We need to make sure we yield on our actual current task. If we are
// waiting we are certainly not the the task being ran.
// waiting we are certainly not the task being ran.
yielders.push_back(WorkerThreadPool::get_singleton()->get_caller_task_id());
}

Expand Down
4 changes: 2 additions & 2 deletions editor/script/script_editor_navigation_marker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,15 @@ bool ScriptEditorNavigationMarker::is_traversing() const {
return traverse_in_progress;
}

bool ScriptEditorNavigationMarker::is_locate_just_occured() const {
bool ScriptEditorNavigationMarker::is_locate_just_occurred() const {
if (Engine::get_singleton()->is_in_physics_frame()) {
return locate_end_physics_frame == Engine::get_singleton()->get_physics_frames() || locate_end_physics_frame == Engine::get_singleton()->get_physics_frames() - 1;
} else {
return locate_end_process_frame == Engine::get_singleton()->get_process_frames();
}
}

bool ScriptEditorNavigationMarker::is_traverse_just_occured() const {
bool ScriptEditorNavigationMarker::is_traverse_just_occurred() const {
if (Engine::get_singleton()->is_in_physics_frame()) {
return traverse_end_physics_frame == Engine::get_singleton()->get_physics_frames() || traverse_end_physics_frame == Engine::get_singleton()->get_physics_frames() - 1;
} else {
Expand Down
4 changes: 2 additions & 2 deletions editor/script/script_editor_navigation_marker.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@ class ScriptEditorNavigationMarker {
bool is_locating() const;
bool is_traversing() const;

bool is_locate_just_occured() const;
bool is_traverse_just_occured() const;
bool is_locate_just_occurred() const;
bool is_traverse_just_occurred() const;
};
2 changes: 1 addition & 1 deletion editor/script/script_text_editor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1215,7 +1215,7 @@ void ScriptTextEditor::_breakpoint_toggled(int p_row) {
}

void ScriptTextEditor::_on_caret_moved() {
if (ScriptEditorNavigationMarker::get_singleton()->is_locate_just_occured() || ScriptEditorNavigationMarker::get_singleton()->is_traverse_just_occured() || ScriptEditorNavigationMarker::get_singleton()->is_locating() || ScriptEditorNavigationMarker::get_singleton()->is_traversing()) {
if (ScriptEditorNavigationMarker::get_singleton()->is_locate_just_occurred() || ScriptEditorNavigationMarker::get_singleton()->is_traverse_just_occurred() || ScriptEditorNavigationMarker::get_singleton()->is_locating() || ScriptEditorNavigationMarker::get_singleton()->is_traversing()) {
return;
}
if (code_editor->is_previewing_navigation_change()) {
Expand Down
2 changes: 1 addition & 1 deletion servers/rendering/rendering_device_graph.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ void RenderingDeviceGraph::_check_discardable_attachment_dependency(ResourceTrac
return;
}

// Check if the command is a a draw list that clears the attachment completely. If it is, we don't need to modify the previous draw list.
// Check if the command is a draw list that clears the attachment completely. If it is, we don't need to modify the previous draw list.
uint32_t command_offset = command_data_offsets[p_command_index];
RecordedDrawListCommand *draw_list_command = reinterpret_cast<RecordedDrawListCommand *>(&command_data[command_offset]);
if (draw_list_command->type == RecordedCommand::TYPE_DRAW_LIST) {
Expand Down