aboutsummaryrefslogtreecommitdiff
path: root/tools/editor/editor_node.cpp
diff options
context:
space:
mode:
authorJuan Linietsky2015-12-21 09:05:49 -0300
committerJuan Linietsky2015-12-21 09:05:49 -0300
commit81f62fb78c7f3c133ef764a99dcdf05077d8ced9 (patch)
tree88787e15447a8a3831f9064bde8949bc62a765b5 /tools/editor/editor_node.cpp
parent93a6ec1e32df7f8f6156f728fe3f82a69ee126ca (diff)
downloadgodot-81f62fb78c7f3c133ef764a99dcdf05077d8ced9.tar.gz
godot-81f62fb78c7f3c133ef764a99dcdf05077d8ced9.tar.zst
godot-81f62fb78c7f3c133ef764a99dcdf05077d8ced9.zip
-Fix to progress dialog, speding it up
-Fix potential deadlock in stream player -Fix collada to support broken files from ColladaMaya
Diffstat (limited to 'tools/editor/editor_node.cpp')
-rw-r--r--tools/editor/editor_node.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 6352a235f..b30c87586 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -4040,9 +4040,9 @@ void EditorNode::progress_add_task(const String& p_task,const String& p_label, i
singleton->progress_dialog->add_task(p_task,p_label,p_steps);
}
-void EditorNode::progress_task_step(const String& p_task, const String& p_state, int p_step) {
+void EditorNode::progress_task_step(const String& p_task, const String& p_state, int p_step,bool p_force_redraw) {
- singleton->progress_dialog->task_step(p_task,p_state,p_step);
+ singleton->progress_dialog->task_step(p_task,p_state,p_step,p_force_redraw);
}