SHS/qglengine
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

twice materialChanged signal fixed

Browse Source
This commit is contained in:
Пелипенко Иван
2023-05-23 22:22:25 +03:00
parent 893910c431
commit fcc1e98a6e
8 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/widgets/materials_editor.cpp
View File

@@ -107,13 +107,14 @@ void MaterialsEditor::selectionChanged() {
if (!view) return;
// qDebug() << "selectionChanged";
ObjectBase * o = view->selectedObject();
if (o) selectMaterial(o->material());
if (!o) return;
if (o->material()) selectMaterial(o->material());
}
void MaterialsEditor::materialsChanged() {
if (ui->widgetMaterial->ignore_next > 0) {
ui->widgetMaterial->ignore_next--;
if (ui->widgetMaterial->ignore_next) {
ui->widgetMaterial->ignore_next = false;
return;
}
Material * cm = currentMaterial();
@@ -153,6 +154,7 @@ void MaterialsEditor::on_buttonRename_clicked() {
int ind = ui->comboMaterial->currentIndex();
ui->comboMaterial->setItemText(ind, QString("[%1] " + nn).arg(ind + 1));
ui->comboMaterial->setItemData(ind, nn);
view->scene()->treeChanged();
}
@@ -193,6 +195,7 @@ void MaterialsEditor::on_buttonAssign_clicked() {
ObjectBaseList ol = view->selectedObjects();
foreach(ObjectBase * o, ol)
o->setMaterial(m, true);
view->scene()->treeChanged();
}