diff options
| author | Juan Linietsky | 2018-01-12 00:08:32 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2018-01-12 00:08:32 -0300 |
| commit | 2cde466ebdb6237b6f72ef78614dc05f2ffb551b (patch) | |
| tree | 2b90d0b53d372c1a8c76343b8ad491403624aed9 /editor | |
| parent | c48aab2f05d931fbab6bf0702e81e45b5cd88aa1 (diff) | |
| download | godot-2cde466ebdb6237b6f72ef78614dc05f2ffb551b.tar.gz godot-2cde466ebdb6237b6f72ef78614dc05f2ffb551b.tar.zst godot-2cde466ebdb6237b6f72ef78614dc05f2ffb551b.zip | |
-Remove color operator clamping, which is unnecesary. Fixes #15184, fixes #14686.
-Refresh progress bar less often, makes baking, exporting, etc. faster.
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/plugins/baked_lightmap_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | editor/plugins/gi_probe_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | editor/progress_dialog.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/editor/plugins/baked_lightmap_editor_plugin.cpp b/editor/plugins/baked_lightmap_editor_plugin.cpp index af175c349..59b79bd07 100644 --- a/editor/plugins/baked_lightmap_editor_plugin.cpp +++ b/editor/plugins/baked_lightmap_editor_plugin.cpp @@ -90,7 +90,7 @@ void BakedLightmapEditorPlugin::bake_func_begin(int p_steps) { bool BakedLightmapEditorPlugin::bake_func_step(int p_step, const String &p_description) { ERR_FAIL_COND_V(tmp_progress == NULL, false); - return tmp_progress->step(p_description, p_step); + return tmp_progress->step(p_description, p_step, false); } void BakedLightmapEditorPlugin::bake_func_end() { diff --git a/editor/plugins/gi_probe_editor_plugin.cpp b/editor/plugins/gi_probe_editor_plugin.cpp index 42aad7a8a..06da64b18 100644 --- a/editor/plugins/gi_probe_editor_plugin.cpp +++ b/editor/plugins/gi_probe_editor_plugin.cpp @@ -73,7 +73,7 @@ void GIProbeEditorPlugin::bake_func_begin(int p_steps) { void GIProbeEditorPlugin::bake_func_step(int p_step, const String &p_description) { ERR_FAIL_COND(tmp_progress == NULL); - tmp_progress->step(p_description, p_step); + tmp_progress->step(p_description, p_step, false); } void GIProbeEditorPlugin::bake_func_end() { diff --git a/editor/progress_dialog.cpp b/editor/progress_dialog.cpp index 5d79b8f94..f735ef97d 100644 --- a/editor/progress_dialog.cpp +++ b/editor/progress_dialog.cpp @@ -200,7 +200,7 @@ bool ProgressDialog::task_step(const String &p_task, const String &p_state, int if (!p_force_redraw) { uint64_t tus = OS::get_singleton()->get_ticks_usec(); - if (tus - last_progress_tick < 50000) //50ms + if (tus - last_progress_tick < 200000) //200ms return cancelled; } |