diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-06-28 09:47:03 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-06-28 09:47:03 -0300 |
| commit | 8e1c0f287db96f73c8715ac1fa387b430f3758ca (patch) | |
| tree | 055c66c63e00ed5e87cb601577e7833e0293740e /scene/resources/packed_scene.cpp | |
| parent | 41a26528e4dc1e9204cbac20e3339ad89a2ed0ce (diff) | |
| download | redot-engine-8e1c0f287db96f73c8715ac1fa387b430f3758ca.tar.gz | |
Fixed bug in instance state ordering, closes #3904
Diffstat (limited to 'scene/resources/packed_scene.cpp')
| -rw-r--r-- | scene/resources/packed_scene.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index ac528e6659..50852dc1f7 100644 --- a/scene/resources/packed_scene.cpp +++ b/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; } } |