Fix data defined symbology for embedded layers

qgis · Mar 28, 2013 · fdd8199 · fdd8199
1 parent cb193d9
commit fdd8199
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/core/symbology-ng/qgslinesymbollayerv2.cpp b/src/core/symbology-ng/qgslinesymbollayerv2.cpp
@@ -710,6 +710,10 @@ QSet<QString> QgsMarkerLineSymbolLayerV2::usedAttributes() const
   {
     attributes.insert( *it );
   }
+  if ( mMarker )
+  {
+    attributes.unite( mMarker->usedAttributes() );
+  }
   return attributes;
 }
 
@@ -791,7 +795,7 @@ void QgsMarkerLineSymbolLayerV2::startRender( QgsSymbolV2RenderContext& context
     hints |= QgsSymbolV2::DataDefinedSizeScale;
   mMarker->setRenderHints( hints );
 
-  mMarker->startRender( context.renderContext() );
+  mMarker->startRender( context.renderContext(), context.layer() );
 
   //prepare expressions for data defined properties
   prepareExpressions( context.layer() );