diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-06-15 10:50:45 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-06-15 10:50:45 +0200 |
| commit | 41b34e3e56e9e63a19834d8e47443fcf70d18583 (patch) | |
| tree | 8ce9a98a34e58c81449e66710253adee0b05cda4 | |
| parent | fe1aa263ca3b5cc77c3c9f8aec4a29f3b107f087 (diff) | |
| parent | 4d4fe94cf09c4e069f0ac4e86c8268014b6b3783 (diff) | |
| download | redot-engine-41b34e3e56e9e63a19834d8e47443fcf70d18583.tar.gz | |
Merge pull request #78240 from KoBeWi/nothing_valid_here,_keep_scrolling
Safe-guard against missing node arrays
| -rw-r--r-- | scene/resources/packed_scene.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index f84dfe0d7a..23942658cc 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -473,7 +473,10 @@ Node *SceneState::instantiate(GenEditState p_edit_state) const { const String base_property = string_property.get_slice("/", 0); const int index = string_property.get_slice("/", 2).to_int(); - Array array = dnp.base->get(base_property); + bool valid; + Array array = dnp.base->get(base_property, &valid); + ERR_CONTINUE(!valid); + if (array.size() >= index) { array.push_back(other); } else { |