Skip to content

Editor: Drag and drop of object can lead to crash #661 #662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eprikazchikov merged 1 commit into from
Jan 13, 2024
Merged

Editor: Drag and drop of object can lead to crash #661 #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions thirdparty/next/src/core/objectsystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,19 +460,14 @@ void ObjectSystem::addObject(Object *object) {
}
/*!
\internal
Removes an \a object from operation lists.
*/
void ObjectSystem::removeObject(Object *object) {
PROFILE_FUNCTION();
if(m_suspendObject == nullptr) {
m_objectList.remove(object);
}
}
/*!
\internal
*/
void ObjectSystem::suspendObject(Object *object) {
m_suspendObject = object;
}
/*!
Returns a list of objects with specified \a type.
\warning This is very small function!
Expand All @@ -486,3 +481,9 @@ Object::ObjectList ObjectSystem::getAllObjectsByType(const string &type) const {
}
return result;
}
/*!
\internal
*/
void ObjectSystem::suspendObject(Object *object) {
m_suspendObject = object;
}
25 changes: 14 additions & 11 deletions worldeditor/src/screens/objecthierarchy/hierarchybrowser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,24 +349,27 @@ void HierarchyBrowser::onDragStarted(Qt::DropActions supportedActions) {
}

void HierarchyBrowser::onSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected) {
QList<Object *> list;

foreach(QModelIndex it, selected.indexes()) {
if(it.column() == 0) {
Object *object = static_cast<Object *>(m_filter->mapToSource(it).internalPointer());

list.push_back(object);
}
if(selected.indexes().isEmpty()) {
emit objectsSelected({}, false);
}

emit objectsSelected(list, false);
}

void HierarchyBrowser::on_treeView_clicked(const QModelIndex &index) {
Object *object = static_cast<Object *>(m_filter->mapToSource(index).internalPointer());
Actor *actor = dynamic_cast<Actor *>(object);
if(actor) {
if(index.column() == 2) {
if(index.column() == 0) {
QList<Object *> list;

QItemSelectionModel *selectionModel = ui->treeView->selectionModel();
for(auto it : selectionModel->selectedIndexes()) {
Object *object = static_cast<Object *>(m_filter->mapToSource(it).internalPointer());

list.push_back(object);
}

emit objectsSelected(list, false);
} else if(index.column() == 2) {
actor->setHideFlags(actor->hideFlags() ^ Actor::ENABLE);
onUpdated();
} else if(index.column() == 3) {
Expand Down
4 changes: 2 additions & 2 deletions worldeditor/src/screens/propertyedit/custom/objectselect/objectselect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ void ObjectSelect::onAssetSelected(QString asset) {
}

void ObjectSelect::dragEnterEvent(QDragEnterEvent *event) {
if(event->mimeData()->hasFormat(gMimeObject)) {
if(event->mimeData()->hasFormat(gMimeObject) && m_objectData.scene) {
sBrowser->onSetRootObject(m_objectData.scene);
QString path(event->mimeData()->data(gMimeObject));
foreach(const QString &it, path.split(";")) {
Expand All @@ -151,7 +151,7 @@ void ObjectSelect::dragEnterEvent(QDragEnterEvent *event) {
}
}
}
} else if(event->mimeData()->hasFormat(gMimeContent)) {
} else if(event->mimeData()->hasFormat(gMimeContent) && !m_templateData.type.isEmpty()) {
QString path(event->mimeData()->data(gMimeContent));
QString type = AssetManager::instance()->assetTypeName(path);
if(type == m_templateData.type) {
Expand Down