Skip to content

Commit 3f681d1

Browse files
committed
Post rebase fixes
1 parent d213d31 commit 3f681d1

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

src/3d/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ INCLUDE_DIRECTORIES(
115115
${CMAKE_SOURCE_DIR}/src/core/
116116
${CMAKE_SOURCE_DIR}/src/core/geometry
117117
${CMAKE_SOURCE_DIR}/src/core/raster
118-
${CMAKE_SOURCE_DIR}/src/core/symbology-ng
118+
${CMAKE_SOURCE_DIR}/src/core/symbology
119119
${CMAKE_SOURCE_DIR}/src/core/metadata
120120
${CMAKE_SOURCE_DIR}/src/core/expression
121121
${CMAKE_SOURCE_DIR}/src/core/3d

src/3d/qgs3dutils.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,6 @@ class _3D_EXPORT Qgs3DUtils
5656
This is used to perform object culling checks.
5757
*/
5858
static bool isCullable( const AABB &bbox, const QMatrix4x4 &viewProjectionMatrix );
59-
60-
/*
61-
* Calculates (x,y,z) position of point in the Point vector layers
62-
*/
63-
static QList<QVector3D> positions(const Map3D &map, QgsVectorLayer *layer, const QgsFeatureRequest &req);
6459
};
6560

6661
#endif // QGS3DUTILS_H

0 commit comments

Comments
 (0)