GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-14 03:06:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

#479 bad memory usage fix (move then delete)

Browse Source 
since march... my fault
This commit is contained in:
supermerill 2020-09-18 01:28:42 +02:00
parent 12a30f7aa6
commit df4b3c7424
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/libslic3r/PerimeterGenerator.cpp
View File

@ -752,7 +752,11 @@ void PerimeterGenerator::process()
coll2.entities.push_back(loop);
}
}
entities = coll2;
//note: this hacky thing is possible because coll2.entities contains in fact entities's entities
//if you does entities = coll2, you'll delete entities's entities and then you have nothing.
entities.entities = coll2.entities;
//and you have to empty coll2 or it will delete his content, hence crashing our hack
coll2.entities.clear();
}
} else if (this->config->external_perimeters_hole.value) {
//reverse the hole, and put them in first place.
@ -768,13 +772,19 @@ void PerimeterGenerator::process()
coll2.entities.push_back(loop);
}
}
entities = coll2;
//note: this hacky thing is possible because coll2.entities contains in fact entities's entities
//if you does entities = coll2, you'll delete entities's entities and then you have nothing.
entities.entities = coll2.entities;
//and you have to empty coll2 or it will delete his content, hence crashing our hack
coll2.entities.clear();
}
}
// append perimeters for this slice as a collection
if (!entities.empty())
this->loops->append(entities);
if (!entities.empty()) {
//move it, to avoid to clone evrything and then delete it
this->loops->entities.emplace_back( new ExtrusionEntityCollection(std::move(entities)));
}
} // for each loop of an island
// fill gaps