Merge pull request #6319 from mhugent/dxf_label_layers

Fix dxf export for label layers with labeling but without symbology
qgis · Feb 13, 2018 · 265bc68 · 265bc68
2 parents c2baf1b + c9e637e
commit 265bc68
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/core/dxf/qgsdxfexport.cpp b/src/core/dxf/qgsdxfexport.cpp
@@ -1072,12 +1072,9 @@ void QgsDxfExport::writeEntities()
       else
       {
         QgsSymbolV2List symbolList = renderer->symbolsForFeature( fet, ctx );
-        if ( symbolList.size() < 1 )
-        {
-          continue;
-        }
+        bool hasSymbology = symbolList.size() > 0;
 
-        if ( mSymbologyExport == QgsDxfExport::SymbolLayerSymbology ) // symbol layer symbology, but layer does not use symbol levels
+        if ( hasSymbology && mSymbologyExport == QgsDxfExport::SymbolLayerSymbology ) // symbol layer symbology, but layer does not use symbol levels
         {
           QgsSymbolV2List::iterator symbolIt = symbolList.begin();
           for ( ; symbolIt != symbolList.end(); ++symbolIt )
@@ -1089,7 +1086,7 @@ void QgsDxfExport::writeEntities()
             }
           }
         }
-        else
+        else if ( hasSymbology )
         {
           // take first symbollayer from first symbol
           QgsSymbolV2* s = symbolList.first();