From 81f62fb78c7f3c133ef764a99dcdf05077d8ced9 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Mon, 21 Dec 2015 09:05:49 -0300 Subject: -Fix to progress dialog, speding it up -Fix potential deadlock in stream player -Fix collada to support broken files from ColladaMaya --- tools/editor/editor_node.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/editor/editor_node.cpp') 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); } -- cgit v1.2.3-70-g09d2