Revert last commit

This reverts commit 5cb6dd7.
qgis · May 22, 2012 · a76d629 · a76d629
1 parent 5cb6dd7
commit a76d629
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/python/plugins/fTools/tools/doGeoprocessing.py b/python/plugins/fTools/tools/doGeoprocessing.py
@@ -1145,18 +1145,14 @@ def union( self ):
               if int_geom.wkbType() == 0:
                 # intersection produced different geometry types
                 temp_list = int_geom.asGeometryCollection()
-                int_geom = []
                 for i in temp_list:
                   if i.type() == geom.type():
-                    int_geom.append( QgsGeometry( i ) )
-                  if len(int_geom) > 1:
-                    for j in int_geom:
-                      try:
-                        outFeat.setGeometry( j )
-                        outFeat.setAttributeMap( ftools_utils.combineVectorAttributes( atMapA, atMapB ) )
-                        writer.addFeature( outFeat )
-                      except Exception, err:
-                        FEATURE_EXCEPT = False
+                    try:
+                      outFeat.setGeometry( j )
+                      outFeat.setAttributeMap( ftools_utils.combineVectorAttributes( atMapA, atMapB ) )
+                      writer.addFeature( outFeat )
+                    except Exception, err:
+                      FEATURE_EXCEPT = False
               try:
                 outFeat.setGeometry( int_geom )
                 outFeat.setAttributeMap( ftools_utils.combineVectorAttributes( atMapA, atMapB ) )