diff -r 7c27cda03747 -r 97df974b5ed5 src/gl/compiler.h --- a/src/gl/compiler.h Fri Mar 06 23:45:44 2020 +0200 +++ b/src/gl/compiler.h Mon Mar 09 14:21:54 2020 +0200 @@ -61,9 +61,9 @@ void bindVertexArray(gl::ArrayClass arrayClass); void releaseVertexArray(gl::ArrayClass arrayClass); void buildShaders(int arrayId); - void setSelectedObjects(const QSet ids); + void setSelectedObjects(const QSet ids); - static ldraw::Id idFromColor(const std::array& data); + static ldraw::id_t idFromColor(const std::array& data); template void setUniform(const char* uniformName, T&& value) @@ -90,7 +90,7 @@ bool initialized = false; BoundingBox boundingBox; const ldraw::ColorTable& colorTable; - ldraw::Id hovered = ldraw::NULL_ID; + ldraw::id_t hovered = ldraw::NULL_ID; struct { QOpenGLShaderProgram* program = nullptr;