Fix vertex marker display for multipolygon (fixes #19909)

Hugo Mercier · nyalldawson · commit 9abcd0e13e27 · 2019-02-01T20:07:31.000+11:00
The i == 0 test was wrong, and a test is actually not needed. (cherry picked from commit 389149c)
diff --git a/src/core/symbology/qgssymbol.cpp b/src/core/symbology/qgssymbol.cpp
@@ -927,14 +927,7 @@ void QgsSymbol::renderFeature( const QgsFeature &feature, QgsRenderContext &cont
 
         if ( drawVertexMarker && !usingSegmentizedGeometry )
         {
-          if ( i == 0 )
-          {
-            markers = pts;
-          }
-          else
-          {
-            markers << pts;
-          }
+          markers << pts;
         }
       }
     }
@@ -989,14 +982,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
`@@ -927,14 +927,7 @@ void QgsSymbol::renderFeature( const QgsFeature &feature, QgsRenderContext &cont`
`927`	`927`
`928`	`928`	`if ( drawVertexMarker && !usingSegmentizedGeometry )`
`929`	`929`	`{`
`930`		`- if ( i == 0 )`
`931`		`- {`
`932`		`- markers = pts;`
`933`		`- }`
`934`		`- else`
`935`		`- {`
`936`		`- markers << pts;`
`937`		`- }`
	`930`	`+ markers << pts;`
`938`	`931`	`}`
`939`	`932`	`}`
`940`	`933`	`}`
`@@ -989,14 +982,7 @@ void QgsSymbol::renderFeature( const QgsFeature &feature, QgsRenderContext &cont`
`989`	`982`
`990`	`983`	`if ( drawVertexMarker && !usingSegmentizedGeometry )`
`991`	`984`	`{`
`992`		`- if ( i == 0 )`
`993`		`- {`
`994`		`- markers = pts;`
`995`		`- }`
`996`		`- else`
`997`		`- {`
`998`		`- markers << pts;`
`999`		`- }`
	`985`	`+ markers << pts;`
`1000`	`986`
`1001`	`987`	`Q_FOREACH ( const QPolygonF &hole, holes )`
`1002`	`988`	`{`