maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #5866 from MarianoGnu/master

Browse source 
Prevent crash in TextureRegionEditor. Fixes #5862
This commit is contained in:
Rémi Verschelde 2016-07-23 09:50:12 +02:00 committed by GitHub
parent 71c12b5801 6622a3d110
commit 5b12b3997b
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tools/editor/plugins/texture_region_editor_plugin.cpp
View file

@ -703,14 +703,24 @@ void TextureRegionEditor::_edit_region()
bool merged = true;
while (merged) {
merged = false;
bool queue_erase = false;
for (List<Rect2>::Element *F = autoslice_cache.front(); F; F=F->next()) {
if (queue_erase){
autoslice_cache.erase(F->prev());
queue_erase = false;
}
if (F==E)
continue;
if (E->get().grow(1).intersects(F->get())) {
E->get().expand_to(F->get().pos);
E->get().expand_to(F->get().pos+F->get().size);
F=F->prev();
autoslice_cache.erase(F->next());
if (F->prev()) {
F=F->prev();
autoslice_cache.erase(F->next());
} else {
queue_erase = true;
//Cant delete the first rect in the list.
}
merged = true;
}
}