diff --git a/src/meshlabplugins/filter_layer/filter_layer.cpp b/src/meshlabplugins/filter_layer/filter_layer.cpp index 6b327cf2e..fda0295ba 100644 --- a/src/meshlabplugins/filter_layer/filter_layer.cpp +++ b/src/meshlabplugins/filter_layer/filter_layer.cpp @@ -58,8 +58,18 @@ FilterLayerPlugin::FilterLayerPlugin() FP_IMPORT_CAMERAS }; - for(ActionIDType tt: types()) - actionList.push_back(new QAction(filterName(tt), this)); + QCoreApplication* app = QCoreApplication::instance(); + + for(ActionIDType tt: types()) { + QAction* act = new QAction(filterName(tt), this); + actionList.push_back(act); + + if (app != nullptr) { + if(tt==FP_DELETE_MESH){ + act->setShortcut(Qt::CTRL + Qt::Key_D); + } + } + } } QString FilterLayerPlugin::pluginName() const diff --git a/src/meshlabplugins/io_gltf/gltf_loader.cpp b/src/meshlabplugins/io_gltf/gltf_loader.cpp index 70f1f68e1..1d4c369ed 100644 --- a/src/meshlabplugins/io_gltf/gltf_loader.cpp +++ b/src/meshlabplugins/io_gltf/gltf_loader.cpp @@ -240,7 +240,7 @@ void loadMeshPrimitive( } if (textureImg != -1) { //if we found a texture //add the path of the texture to the mesh - std::string uri = model.images[textureImg].uri; + std::string uri = model.images[model.textures[textureImg].source].uri; uri = std::regex_replace(uri, std::regex("\\%20"), " "); m.cm.textures.push_back(uri); //set the id of the texture: we need it when set uv coords