Merge pull request #9036 from mhugo/fix_19909

Hugo Mercier · web-flow · commit c3819e88dc72 · 2019-01-31T10:21:28.000+01:00
Fix vertex marker display for multipolygon (fixes #19909)
diff --git a/src/core/symbology/qgssymbol.cpp b/src/core/symbology/qgssymbol.cpp
@@ -936,14 +936,7 @@ void QgsSymbol::renderFeature( const QgsFeature &feature, QgsRenderContext &cont
 
         if ( drawVertexMarker && !usingSegmentizedGeometry )
         {
-          if ( i == 0 )
-          {
-            markers = pts;
-          }
-          else
-          {
-            markers << pts;
-          }
+          markers << pts;
         }
       }
     }
@@ -998,14 +991,7 @@ void QgsSymbol::renderFeature( const QgsFeature &feature, QgsRenderContext &cont
 
           if ( drawVertexMarker && !usingSegmentizedGeometry )
           {
-            if ( i == 0 )
-            {
-              markers = pts;
-            }
-            else
-            {
-              markers << pts;
-            }
+            markers << pts;
 
             Q_FOREACH ( const QPolygonF &hole, holes )
             {

Original file line number	Diff line number	Diff line change
`@@ -936,14 +936,7 @@ void QgsSymbol::renderFeature( const QgsFeature &feature, QgsRenderContext &cont`
`936`	`936`
`937`	`937`	`if ( drawVertexMarker && !usingSegmentizedGeometry )`
`938`	`938`	`{`
`939`		`- if ( i == 0 )`
`940`		`- {`
`941`		`- markers = pts;`
`942`		`- }`
`943`		`- else`
`944`		`- {`
`945`		`- markers << pts;`
`946`		`- }`
	`939`	`+ markers << pts;`
`947`	`940`	`}`
`948`	`941`	`}`
`949`	`942`	`}`
`@@ -998,14 +991,7 @@ void QgsSymbol::renderFeature( const QgsFeature &feature, QgsRenderContext &cont`
`998`	`991`
`999`	`992`	`if ( drawVertexMarker && !usingSegmentizedGeometry )`
`1000`	`993`	`{`
`1001`		`- if ( i == 0 )`
`1002`		`- {`
`1003`		`- markers = pts;`
`1004`		`- }`
`1005`		`- else`
`1006`		`- {`
`1007`		`- markers << pts;`
`1008`		`- }`
	`994`	`+ markers << pts;`
`1009`	`995`
`1010`	`996`	`Q_FOREACH ( const QPolygonF &hole, holes )`
`1011`	`997`	`{`