godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

-Increment resources total in scene format text, fixes #3506

Browse Source
This commit is contained in:
Juan Linietsky
2016-01-29 08:41:22 -03:00
parent 593b01b709
commit 8341038bbe
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scene/resources/scene_format_text.cpp
View File

@@ -170,6 +170,7 @@ Error ResourceInteractiveLoaderText::poll() {
_printerr(); _printerr();
} }
resource_current++;
return error; return error;
@@ -227,6 +228,8 @@ Error ResourceInteractiveLoaderText::poll() {
} }
resource_current++;
while(true) { while(true) {
String assign; String assign;
@@ -291,6 +294,8 @@ Error ResourceInteractiveLoaderText::poll() {
resource=Ref<Resource>(r); resource=Ref<Resource>(r);
resource_current++;
while(true) { while(true) {
String assign; String assign;
@@ -745,6 +750,8 @@ void ResourceInteractiveLoaderText::open(FileAccess *p_f,bool p_skip_first_tag)
stream.f=f; stream.f=f;
is_scene=false; is_scene=false;
resource_current=0;
VariantParser::Tag tag; VariantParser::Tag tag;
Error err = VariantParser::parse_tag(&stream,lines,error_text,tag); Error err = VariantParser::parse_tag(&stream,lines,error_text,tag);

2
tools/editor/editor_file_system.cpp
View File

@@ -1166,8 +1166,10 @@ EditorFileSystemDirectory *EditorFileSystem::get_path(const String& p_path) {
void EditorFileSystem::_resource_saved(const String& p_path){ void EditorFileSystem::_resource_saved(const String& p_path){
//print_line("resource saved: "+p_path); //print_line("resource saved: "+p_path);
EditorFileSystem::get_singleton()->update_file(p_path); EditorFileSystem::get_singleton()->update_file(p_path);
} }
String EditorFileSystem::_find_first_from_source(EditorFileSystemDirectory* p_dir,const String &p_src) const { String EditorFileSystem::_find_first_from_source(EditorFileSystemDirectory* p_dir,const String &p_src) const {