diff options
| author | Ariel Manzur <ariel@godotengine.org> | 2015-12-20 11:42:55 -0300 |
|---|---|---|
| committer | Ariel Manzur <ariel@godotengine.org> | 2015-12-20 11:42:55 -0300 |
| commit | a5fe71a0e9a8714ae8f23f306b4d8b747d11382d (patch) | |
| tree | a13bfc0014a8dbdfe24a629b23b042bba42204ab /tools/editor | |
| parent | 5f1ae5eac208101e62da6361be21265f06d3a3b8 (diff) | |
this failed in msvc, didn't in linux and mingw
Diffstat (limited to 'tools/editor')
| -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 b6c68d05be..416f52f30b 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)); |