diff options
author | Juan Linietsky <reduzio@gmail.com> | 2016-01-29 08:41:22 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2016-01-29 08:51:51 -0300 |
commit | 8341038bbe51e7e513dbc1370d5a0f2bd8f48ace (patch) | |
tree | 89ba8a22ae2809b8a5fd8383de152cf95d35a83e | |
parent | 593b01b709517c36e65507c20ccf9c80907c67a2 (diff) |
-Increment resources total in scene format text, fixes #3506
-rw-r--r-- | scene/resources/scene_format_text.cpp | 7 | ||||
-rw-r--r-- | tools/editor/editor_file_system.cpp | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/scene/resources/scene_format_text.cpp b/scene/resources/scene_format_text.cpp index f3dcf16e28..d9f6beabc0 100644 --- a/scene/resources/scene_format_text.cpp +++ b/scene/resources/scene_format_text.cpp @@ -170,6 +170,7 @@ Error ResourceInteractiveLoaderText::poll() { _printerr(); } + resource_current++; return error; @@ -227,6 +228,8 @@ Error ResourceInteractiveLoaderText::poll() { } + resource_current++; + while(true) { String assign; @@ -291,6 +294,8 @@ Error ResourceInteractiveLoaderText::poll() { resource=Ref<Resource>(r); + resource_current++; + while(true) { String assign; @@ -745,6 +750,8 @@ void ResourceInteractiveLoaderText::open(FileAccess *p_f,bool p_skip_first_tag) stream.f=f; is_scene=false; + resource_current=0; + VariantParser::Tag tag; Error err = VariantParser::parse_tag(&stream,lines,error_text,tag); diff --git a/tools/editor/editor_file_system.cpp b/tools/editor/editor_file_system.cpp index c7c1a48e34..ad59efc46f 100644 --- a/tools/editor/editor_file_system.cpp +++ b/tools/editor/editor_file_system.cpp @@ -1166,8 +1166,10 @@ EditorFileSystemDirectory *EditorFileSystem::get_path(const String& p_path) { void EditorFileSystem::_resource_saved(const String& p_path){ + //print_line("resource saved: "+p_path); EditorFileSystem::get_singleton()->update_file(p_path); + } String EditorFileSystem::_find_first_from_source(EditorFileSystemDirectory* p_dir,const String &p_src) const { |