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

no more time error, fixes #2892

Browse Source
This commit is contained in:
Juan Linietsky 2015-12-12 19:21:43 -03:00
parent 6316f8941c
commit 9f75dd086e
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/variant_parser.cpp
View File

@ -468,7 +468,7 @@ Error VariantParser::parse_value(Token& token,Variant &value,Stream *p_stream,in
return err; return err;
if (args.size()!=4) { if (args.size()!=4) {
r_err_str="Expected 2 arguments for constructor"; r_err_str="Expected 4 arguments for constructor";
} }
value=Rect2(args[0],args[1],args[2],args[3]); value=Rect2(args[0],args[1],args[2],args[3]);

5
tools/editor/editor_file_dialog.cpp
View File

@ -6,6 +6,8 @@
#include "editor_resource_preview.h" #include "editor_resource_preview.h"
#include "editor_settings.h" #include "editor_settings.h"
#include "scene/gui/margin_container.h" #include "scene/gui/margin_container.h"
#include "os/file_access.h"
EditorFileDialog::GetIconFunc EditorFileDialog::get_icon_func=NULL; EditorFileDialog::GetIconFunc EditorFileDialog::get_icon_func=NULL;
EditorFileDialog::GetIconFunc EditorFileDialog::get_large_icon_func=NULL; EditorFileDialog::GetIconFunc EditorFileDialog::get_large_icon_func=NULL;
@ -194,6 +196,9 @@ void EditorFileDialog::_thumbnail_done(const String& p_path,const Ref<Texture>&
void EditorFileDialog::_request_single_thumbnail(const String& p_path) { void EditorFileDialog::_request_single_thumbnail(const String& p_path) {
if (!FileAccess::exists(p_path))
return;
EditorResourcePreview::get_singleton()->queue_resource_preview(p_path,this,"_thumbnail_done",p_path); EditorResourcePreview::get_singleton()->queue_resource_preview(p_path,this,"_thumbnail_done",p_path);
//print_line("want file "+p_path); //print_line("want file "+p_path);
set_process(true); set_process(true);