CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version bump

Browse Source
This commit is contained in:
Vulpovile
2022-10-03 22:16:30 -07:00
parent e1716e7417
commit aaceb4eb21
6 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/source/Application.cpp
View File

@@ -161,22 +161,23 @@ void Application::deleteInstance()
{
if(_dataModel->getSelectionService()->getSelection().size() > 0)
{
size_t undeletable = 0;
while(_dataModel->getSelectionService()->getSelection().size() > undeletable)
std::vector<Instance *> selection = _dataModel->getSelectionService()->getSelection();
std::vector<Instance *> toDelete;
for(size_t i = 0; i < selection.size(); i++) {
if(selection[i]->canDelete) {
toDelete.push_back(selection[i]);
}
}
if(toDelete.size() > 0)
{
if(_dataModel->getSelectionService()->getSelection()[0]->canDelete)
{
AudioPlayer::playSound(GetFileInPath("/content/sounds/pageturn.wav"));
Instance* selectedInstance = g_dataModel->getSelectionService()->getSelection()[0];
_dataModel->getSelectionService()->removeChild(selectedInstance);
AudioPlayer::playSound(GetFileInPath("/content/sounds/pageturn.wav"));
for(size_t i = 0; i < toDelete.size(); i++) {
Instance* selectedInstance = toDelete[i];
_dataModel->getSelectionService()->removeSelected(selectedInstance);
selectedInstance->setParent(NULL);
delete selectedInstance;
selectedInstance = NULL;
}
else
{
undeletable++;
}
}
}
if(_dataModel->getSelectionService()->getSelection().size() == 0)