Post rebase fixes

src/3d/CMakeLists.txt

@@ -115,7 +115,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/src/core/
   ${CMAKE_SOURCE_DIR}/src/core/geometry
   ${CMAKE_SOURCE_DIR}/src/core/raster
-  ${CMAKE_SOURCE_DIR}/src/core/symbology-ng
+  ${CMAKE_SOURCE_DIR}/src/core/symbology
   ${CMAKE_SOURCE_DIR}/src/core/metadata
   ${CMAKE_SOURCE_DIR}/src/core/expression
   ${CMAKE_SOURCE_DIR}/src/core/3d

src/3d/qgs3dutils.h

@@ -56,11 +56,6 @@ class _3D_EXPORT Qgs3DUtils
         This is used to perform object culling checks.
     */
     static bool isCullable( const AABB &bbox, const QMatrix4x4 &viewProjectionMatrix );
-
-    /*
-     * Calculates (x,y,z) position of point in the Point vector layers
-     */
-    static QList<QVector3D> positions(const Map3D &map, QgsVectorLayer *layer, const QgsFeatureRequest &req);
 };
 
 #endif // QGS3DUTILS_H