Geometry type check in merge tool is not necessary any more (geometry type conversion is done in provider)

mhugent · mhugent · commit 8d70a5141b0f · 2016-05-09T11:22:14.000+02:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -6657,18 +6657,6 @@ void QgisApp::mergeSelectedFeatures()
     return;
   }
 
-  //make a first geometry union and notify the user straight away if the union geometry type does not match the layer one
-  if ( providerChecksTypeStrictly && unionGeom->wkbType() != vl->wkbType() )
-  {
-    messageBar()->pushMessage(
-      tr( "Merge cancelled" ),
-      tr( "The union operation would result in a geometry type that is not compatible with the current layer." ),
-      QgsMessageBar::CRITICAL );
-
-    delete unionGeom;
-    return;
-  }
-
   //merge the attributes together
   QgsMergeAttributesDialog d( featureList, vl, mapCanvas() );
   if ( d.exec() == QDialog::Rejected )
@@ -6707,16 +6695,6 @@ void QgisApp::mergeSelectedFeatures()
       }
       return;
     }
-
-    if ( providerChecksTypeStrictly && unionGeom->wkbType() != vl->wkbType() )
-    {
-      messageBar()->pushMessage(
-        tr( "Merge cancelled" ),
-        tr( "The union operation would result in a geometry type that is not compatible with the current layer." ),
-        QgsMessageBar::CRITICAL );
-      delete unionGeom;
-      return;
-    }
   }
 
   vl->beginEditCommand( tr( "Merged features" ) );
