Consider also original marker rotation in marker line with rotated sy…

…mbols.

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12720 c8812cc2-4d05-0410-92ff-de0c093fc19c

src/core/symbology-ng/qgslinesymbollayerv2.cpp

@@ -231,6 +231,7 @@ void QgsMarkerLineSymbolLayerV2::renderPolylineNoOffset( const QPolygonF& points
   QPointF lastPt = points[0];
   double lengthLeft = 0; // how much is left until next marker
   bool first = true;
+  double origAngle = mMarker->angle();
 
   for ( int i = 1; i < points.count(); ++i )
   {
@@ -252,7 +253,7 @@ void QgsMarkerLineSymbolLayerV2::renderPolylineNoOffset( const QPolygonF& points
     // rotate marker (if desired)
     if ( mRotateMarker )
     {
-      mMarker->setAngle( l.angle() * 180 / M_PI );
+      mMarker->setAngle( origAngle + ( l.angle() * 180 / M_PI ) );
       mMarker->startRender( context );
     }
 
@@ -279,6 +280,9 @@ void QgsMarkerLineSymbolLayerV2::renderPolylineNoOffset( const QPolygonF& points
       mMarker->stopRender( context );
   }
 
+  // restore original rotation
+  mMarker->setAngle( origAngle );
+
 }
 
 QgsStringMap QgsMarkerLineSymbolLayerV2::properties() const