[3d] Fix edge drawing when multiple renderer rules have edges enabled

wonder-sk · wonder-sk · commit 736327634e56 · 2019-04-23T17:54:00.000+02:00
When using rule-based 3D rendering, if multiple rules were enabled with edge rendering,
only the first rule was getting correctly set up line width for line material.
(the rest were getting some very thick line width and making the 3D view unusable)
diff --git a/src/3d/qgs3dmapscene.cpp b/src/3d/qgs3dmapscene.cpp
@@ -575,8 +575,7 @@ void Qgs3DMapScene::addLayerEntity( QgsMapLayer *layer )
 
       // this is probably not the best place for material-specific configuration,
       // maybe this could be more generalized when other materials need some specific treatment
-      QgsLineMaterial *lm = newEntity->findChild<QgsLineMaterial *>();
-      if ( lm )
+      for ( QgsLineMaterial *lm : newEntity->findChildren<QgsLineMaterial *>() )
       {
         connect( mCameraController, &QgsCameraController::viewportChanged, lm, [lm, this]
         {

Original file line number	Diff line number	Diff line change
`@@ -575,8 +575,7 @@ void Qgs3DMapScene::addLayerEntity( QgsMapLayer *layer )`
`575`	`575`
`576`	`576`	`// this is probably not the best place for material-specific configuration,`
`577`	`577`	`// maybe this could be more generalized when other materials need some specific treatment`
`578`		`- QgsLineMaterial lm = newEntity->findChild<QgsLineMaterial >();`
`579`		`- if ( lm )`
	`578`	`+ for ( QgsLineMaterial lm : newEntity->findChildren<QgsLineMaterial >() )`
`580`	`579`	`{`
`581`	`580`	`connect( mCameraController, &QgsCameraController::viewportChanged, lm, [lm, this]`
`582`	`581`	`{`