[vectortile] Fix mapbox gl convertor handling of fill-outline-color w…

…hen fill-color is expression driven
qgis · Nov 19, 2021 · 8e46f2c · 8e46f2c
1 parent bec5836
commit 8e46f2c
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/src/core/vectortile/qgsmapboxglstyleconverter.cpp b/src/core/vectortile/qgsmapboxglstyleconverter.cpp
@@ -232,15 +232,12 @@ bool QgsMapBoxGlStyleConverter::parseFillLayer( const QVariantMap &jsonLayer, Qg
   {
     if ( !jsonPaint.contains( QStringLiteral( "fill-outline-color" ) ) )
     {
-      // fill-outline-color
       if ( fillColor.isValid() )
         fillOutlineColor = fillColor;
-      else
-      {
-        // use fill color data defined property
-        if ( ddProperties.isActive( QgsSymbolLayer::PropertyFillColor ) )
-          ddProperties.setProperty( QgsSymbolLayer::PropertyStrokeColor,  ddProperties.property( QgsSymbolLayer::PropertyFillColor ) );
-      }
+
+      // match fill color data defined property when active
+      if ( ddProperties.isActive( QgsSymbolLayer::PropertyFillColor ) )
+        ddProperties.setProperty( QgsSymbolLayer::PropertyStrokeColor,  ddProperties.property( QgsSymbolLayer::PropertyFillColor ) );
     }
     else
     {