瀏覽代碼

Fixed bug in instance state ordering, closes #3904

Juan Linietsky 9 年之前
父節點
當前提交
8e1c0f287d
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 3 1
      scene/resources/packed_scene.cpp
  2. 1 3
      tools/editor/editor_file_system.cpp

+ 3 - 1
scene/resources/packed_scene.cpp

@@ -375,7 +375,7 @@ Error SceneState::_parse_node(Node *p_owner,Node *p_node,int p_parent_idx, Map<S
 						PackState ps;
 						ps.node=node;
 						ps.state=state;
-						pack_state_stack.push_front(ps);
+						pack_state_stack.push_back(ps);
 						instanced_by_owner=false;
 					}
 				}
@@ -545,6 +545,7 @@ https://github.com/godotengine/godot/issues/3127
 			}
 
 #endif
+
 			if (exists) {
 
 				//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)
 						continue;
 				} else if (bool(Variant::evaluate(Variant::OP_EQUAL,value,original))) {
+
 					continue;
 				}
 			}

+ 1 - 3
tools/editor/editor_file_system.cpp

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