Conjure/LOG750-LAB2
6
0
Fork 0
mirror of https://github.com/ConjureETS/LOG750-LAB2.git synced 2026-03-24 03:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Proper remov

Browse Source
This commit is contained in:
Riku Avelar 2016-11-25 18:27:26 -05:00
parent 78935a18ae
commit 7c05245201
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/viewer/simpleViewer.cpp
View File

@ -818,17 +818,17 @@ void Viewer::setMinLinear(bool on) {
void Viewer::deleteSelected() { void Viewer::deleteSelected() {
// Remove Shape from its parent // Remove Shape from its parent
if(selectedObj.shape == nullptr) return; if(selectedObj.shape == nullptr) return;
selectedObj.shape->getParent()->getChildren()->erase( // selectedObj.shape->getParent()->getChildren()->erase(
std::remove(selectedObj.shape->getParent()->getChildren()->begin(), // std::remove(selectedObj.shape->getParent()->getChildren()->begin(),
selectedObj.shape->getParent()->getChildren()->end(), // selectedObj.shape->getParent()->getChildren()->end(),
selection), // selection),
selectedObj.shape->getParent()->getChildren()->end()); // selectedObj.shape->getParent()->getChildren()->end());
selectedObj.shape->getParent()->getChildren()->erase( selectedObj.shape->getParent()->getParent()->getChildren()->erase(
std::remove(selectedObj.shape->getParent()->getChildren()->begin(), std::remove(selectedObj.shape->getParent()->getParent()->getChildren()->begin(),
selectedObj.shape->getParent()->getChildren()->end(), selectedObj.shape->getParent()->getParent()->getChildren()->end(),
selectedObj.shape), selectedObj.shape->getParent()),
selectedObj.shape->getParent()->getChildren()->end()); selectedObj.shape->getParent()->getParent()->getChildren()->end());
selectedObj.shape = nullptr; // Rebind to "null" selectedObj.shape = nullptr; // Rebind to "null"