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

Fixed bug in instance state ordering, closes #3904 

(cherry picked from commit 8e1c0f287d)
This commit is contained in:
Juan Linietsky 2016-06-28 09:47:03 -03:00 committed by Rémi Verschelde
parent a2d2eb9a63
commit a2103bac7c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scene/resources/packed_scene.cpp
View File

@ -375,7 +375,7 @@ Error SceneState::_parse_node(Node *p_owner,Node *p_node,int p_parent_idx, Map<S
PackState ps; PackState ps;
ps.node=node; ps.node=node;
ps.state=state; ps.state=state;
pack_state_stack.push_front(ps); pack_state_stack.push_back(ps);
instanced_by_owner=false; instanced_by_owner=false;
} }
} }
@ -545,6 +545,7 @@ https://github.com/godotengine/godot/issues/3127
} }
#endif #endif
if (exists) { if (exists) {
//check if already exists and did not change //check if already exists and did not change
@ -556,6 +557,7 @@ https://github.com/godotengine/godot/issues/3127
if (Math::abs(a-b)<CMP_EPSILON) if (Math::abs(a-b)<CMP_EPSILON)
continue; continue;
} else if (bool(Variant::evaluate(Variant::OP_EQUAL,value,original))) { } else if (bool(Variant::evaluate(Variant::OP_EQUAL,value,original))) {
continue; continue;
} }
} }

4
tools/editor/editor_file_system.cpp
View File

@ -783,12 +783,10 @@ void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir,const S
} }
} }
da->list_dir_end(); da->list_dir_end();
memdelete(da); memdelete(da);
} }
for(int i=0;i<p_dir->files.size();i++) { for(int i=0;i<p_dir->files.size();i++) {