Merge pull request #1698 from jdugge/MergetoolEmptyGeometries

Make the Merge shapefiles tool correctly handle features without geometries

Author: alexbruy

python/plugins/fTools/tools/doMergeShapes.py

@@ -317,8 +317,9 @@ def run( self ):
             mergedAttrs[ fieldMap[shapeIndex][fieldIndex] ] = v
           fieldIndex += 1
 
-        inGeom = QgsGeometry( inFeat.geometry() )
-        outFeat.setGeometry( inGeom )
+        if inFeat.geometry() is not None:
+            inGeom = QgsGeometry( inFeat.geometry() )
+            outFeat.setGeometry( inGeom )
         outFeat.setAttributes( mergedAttrs )
         writer.addFeature( outFeat )
         self.emit( SIGNAL( "featureProcessed()" ) )