diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-12-21 09:07:06 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-12-21 09:07:06 -0300 |
| commit | 15429d6ac95acb044c9eebd64356f33e7e5d14ef (patch) | |
| tree | 872a375b64d93fd6aaf1239e058a13630c9cfabe /tools | |
| parent | 81f62fb78c7f3c133ef764a99dcdf05077d8ced9 (diff) | |
| parent | b2f670ebaefa16b0345f9a7ae825f78dbfdec9f8 (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/editor/editor_import_export.cpp | 5 | ||||
| -rw-r--r-- | tools/editor/plugins/script_editor_plugin.cpp | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/tools/editor/editor_import_export.cpp b/tools/editor/editor_import_export.cpp index 35f9375035..c50a95a93d 100644 --- a/tools/editor/editor_import_export.cpp +++ b/tools/editor/editor_import_export.cpp @@ -1128,10 +1128,7 @@ Error EditorExportPlatform::save_zip(const String& p_path, bool p_make_bundles) zipClose(zip,NULL); - if (err) - return err; - - + return err; } Error EditorExportPlatform::save_pack(FileAccess *dst,bool p_make_bundles, int p_alignment) { diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp index 178871ea75..f22bd3d956 100644 --- a/tools/editor/plugins/script_editor_plugin.cpp +++ b/tools/editor/plugins/script_editor_plugin.cpp @@ -1773,7 +1773,7 @@ void ScriptEditor::_update_script_colors() { if (h>hist_size) { continue; } - float v = Math::ease((edit_pass-pass)/float_t(hist_size),0.4); + float v = Math::ease((edit_pass-pass)/float(hist_size),0.4); script_list->set_item_custom_bg_color(i,hot_color.linear_interpolate(cold_color,v)); |