Fix cannot set line symbol data defined properties for vector

field marker (refs #15131)
qgis · Jun 26, 2016 · 6d6aa8d · 6d6aa8d
1 parent 9c16a95
commit 6d6aa8d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/core/symbology-ng/qgsvectorfieldsymbollayer.cpp b/src/core/symbology-ng/qgsvectorfieldsymbollayer.cpp
@@ -283,7 +283,7 @@ void QgsVectorFieldSymbolLayer::drawPreviewIcon( QgsSymbolV2RenderContext& conte
 
 QSet<QString> QgsVectorFieldSymbolLayer::usedAttributes() const
 {
-  QSet<QString> attributes;
+  QSet<QString> attributes = QgsMarkerSymbolLayerV2::usedAttributes();
   if ( !mXAttribute.isEmpty() )
   {
     attributes.insert( mXAttribute );
@@ -292,6 +292,10 @@ QSet<QString> QgsVectorFieldSymbolLayer::usedAttributes() const
   {
     attributes.insert( mYAttribute );
   }
+  if ( mLineSymbol )
+  {
+    attributes.unite( mLineSymbol->usedAttributes() );
+  }
   return attributes;
 }