diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-01-07 08:04:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-07 08:04:09 +0100 |
| commit | 26e8fb855febb09583f9c6fe176c1846f39b3be5 (patch) | |
| tree | 3807f62ef43ce4fe0aa5402657754ee9af2a2f7a | |
| parent | e2a6cae0c75eba84029d44449b658123ed8d6614 (diff) | |
| parent | d43ad46e42c384539283efa6ca26d3babd905adf (diff) | |
Merge pull request #34876 from timothyqiu/regression-fix
Fixes import of models as PackedScene
| -rw-r--r-- | scene/resources/packed_scene.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index 978d81d5c2..3e7d350eec 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -1099,11 +1099,11 @@ void SceneState::set_bundled_scene(const Dictionary &p_dictionary) { const int node_count = p_dictionary["node_count"]; const PoolVector<int> snodes = p_dictionary["nodes"]; - ERR_FAIL_COND(snodes.size() != node_count); + ERR_FAIL_COND(snodes.size() < node_count); const int conn_count = p_dictionary["conn_count"]; const PoolVector<int> sconns = p_dictionary["conns"]; - ERR_FAIL_COND(sconns.size() != conn_count); + ERR_FAIL_COND(sconns.size() < conn_count); PoolVector<String> snames = p_dictionary["names"]; if (snames.size()) { |