Make the "Merge shapefiles" tool correctly handle features without geometries.

jdugge · jdugge · commit 03faafa4a2ed · 2014-11-23T10:23:57.000+01:00
diff --git a/python/plugins/fTools/tools/doMergeShapes.py b/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()" ) )
