godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

this failed in msvc, didn't in linux and mingw

Browse Source
This commit is contained in:
Ariel Manzur 2015-12-20 11:42:55 -03:00
parent 5f1ae5eac2
commit a5fe71a0e9
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/editor/editor_import_export.cpp
View File

@ -1128,10 +1128,7 @@ Error EditorExportPlatform::save_zip(const String& p_path, bool p_make_bundles)
zipClose(zip,NULL); zipClose(zip,NULL);
if (err) return err;
return err;
} }
Error EditorExportPlatform::save_pack(FileAccess *dst,bool p_make_bundles, int p_alignment) { Error EditorExportPlatform::save_pack(FileAccess *dst,bool p_make_bundles, int p_alignment) {

2
tools/editor/plugins/script_editor_plugin.cpp
View File

@ -1773,7 +1773,7 @@ void ScriptEditor::_update_script_colors() {
if (h>hist_size) { if (h>hist_size) {
continue; 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)); script_list->set_item_custom_bg_color(i,hot_color.linear_interpolate(cold_color,v));