relocated qgsdirectionallightsettings.h header guards and fixed a typo

qgis · Jun 19, 2020 · 73209b3 · 73209b3
1 parent d1ed0cc
commit 73209b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/3d/qgs3dmapscene.cpp b/src/3d/qgs3dmapscene.cpp
@@ -478,15 +478,15 @@ void Qgs3DMapScene::updateLights()
   }
 
   const auto newDirectionalLights = mMap.directionalLights();
-  for ( const QgsDirectionalLightSettings &pointLightSettings : newDirectionalLights )
+  for ( const QgsDirectionalLightSettings &directionalLightSettings : newDirectionalLights )
   {
     Qt3DCore::QEntity *lightEntity = new Qt3DCore::QEntity;
     Qt3DCore::QTransform *lightTransform = new Qt3DCore::QTransform;
 
     Qt3DRender::QDirectionalLight *light = new Qt3DRender::QDirectionalLight;
-    light->setColor( pointLightSettings.color() );
-    light->setIntensity( pointLightSettings.intensity() );
-    QgsVector3D direction = pointLightSettings.direction();
+    light->setColor( directionalLightSettings.color() );
+    light->setIntensity( directionalLightSettings.intensity() );
+    QgsVector3D direction = directionalLightSettings.direction();
     light->setWorldDirection( QVector3D( direction.x(), direction.y(), direction.z() ) );
 
     lightEntity->addComponent( light );

diff --git a/src/3d/qgsdirectionallightsettings.h b/src/3d/qgsdirectionallightsettings.h
@@ -1,5 +1,3 @@
-#ifndef QGSDIRECTIONALLIGHTSETTINGS_H
-#define QGSDIRECTIONALLIGHTSETTINGS_H
 /***************************************************************************
   qgsdirectionallightsettings.h
   --------------------------------------
@@ -15,6 +13,8 @@
  *                                                                         *
  ***************************************************************************/
 
+#ifndef QGSDIRECTIONALLIGHTSETTINGS_H
+#define QGSDIRECTIONALLIGHTSETTINGS_H
 #include "qgis_3d.h"
 
 #include "qgsvector3d.h"