From d90b5d5259e751cb8b23fe55d735307f10fef3c9 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Fri, 21 Dec 2018 12:35:22 +0100 Subject: [PATCH] Fix reload c3t3 --- Polyhedron/demo/Polyhedron/MainWindow.cpp | 2 +- Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Polyhedron/demo/Polyhedron/MainWindow.cpp b/Polyhedron/demo/Polyhedron/MainWindow.cpp index ddc8cf0668d..9f164a121a1 100644 --- a/Polyhedron/demo/Polyhedron/MainWindow.cpp +++ b/Polyhedron/demo/Polyhedron/MainWindow.cpp @@ -1016,9 +1016,9 @@ void MainWindow::reloadItem() { new_item->setRenderingMode(item->renderingMode()); new_item->setVisible(item->visible()); Scene_item_with_properties *property_item = dynamic_cast(new_item); + scene->replaceItem(scene->item_id(item), new_item, true); if(property_item) property_item->copyProperties(item); - scene->replaceItem(scene->item_id(item), new_item, true); new_item->invalidateOpenGLBuffers(); item->deleteLater(); } diff --git a/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp b/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp index 8abcf815820..0e9eb038efc 100644 --- a/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp @@ -1304,7 +1304,7 @@ QMenu* Scene_c3t3_item::contextMenu() QMenu *container = new QMenu(tr("Alpha value")); container->menuAction()->setProperty("is_groupable", true); QWidgetAction *sliderAction = new QWidgetAction(0); - sliderAction->setDefaultWidget(d->alphaSlider); + sliderAction->setDefaultWidget(alphaSlider()); connect(d->alphaSlider, &QSlider::valueChanged, [this]() {