Showing with 2 additions and 1 deletion.

BIN python/plugins/fTools/icons/gis/merge_shapes.png

+1 −0 python/plugins/fTools/resources.qrc

+1 −1 src/app/attributetable/qgsattributetablemodel.cpp
diff --git a/python/plugins/fTools/icons/gis/merge_shapes.png b/python/plugins/fTools/icons/gis/merge_shapes.png
diff --git a/python/plugins/fTools/resources.qrc b/python/plugins/fTools/resources.qrc
@@ -90,6 +90,7 @@
         <file>icons/gis/delaunay.png</file>
         <file>icons/gis/layer_extent.png</file>
         <file>icons/gis/voronoi.png</file>
+        <file>icons/gis/merge_shapes.png</file>
         <file>icons/default/voronoi.png</file>
     </qresource>
 </RCC>
diff --git a/src/app/attributetable/qgsattributetablemodel.cpp b/src/app/attributetable/qgsattributetablemodel.cpp
@@ -506,7 +506,7 @@ void QgsAttributeTableModel::featureForm( QModelIndex &idx )
   f.setFeatureId( rowToId( idx.row() ) );
   for ( int i = 0; i < mAttributes.size(); i++ )
   {
-    f.changeAttribute( i, data( index( idx.row(), i ), Qt::EditRole ) );
+    f.changeAttribute( mAttributes[i], data( index( idx.row(), i ), Qt::EditRole ) );
   }
 
   QgsFeatureAction action( tr( "Attributes changed" ), f, mLayer, -1, this );