From 01454584fc6f4c1a04f67ac8564c86575faf3ea5 Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 31 May 2018 13:47:31 +0200 Subject: [PATCH] fix inconsistent default parameters, fix warnings --- src/Gui/NaviCube.cpp | 3 +++ src/Gui/View3DInventor.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Gui/NaviCube.cpp b/src/Gui/NaviCube.cpp index 61321c38c9..91ddc438ae 100644 --- a/src/Gui/NaviCube.cpp +++ b/src/Gui/NaviCube.cpp @@ -375,6 +375,7 @@ GLuint NaviCubeImplementation::createCubeFaceTex(QtGLWidget* gl, float gap, floa #if !defined(HAVE_QT5_OPENGL) return gl->bindTexture(image); #else + Q_UNUSED(gl); QOpenGLTexture *texture = new QOpenGLTexture(image.mirrored()); m_glTextures.push_back(texture); return texture->textureId(); @@ -476,6 +477,7 @@ GLuint NaviCubeImplementation::createButtonTex(QtGLWidget* gl, int button) { #if !defined(HAVE_QT5_OPENGL) return gl->bindTexture(image); #else + Q_UNUSED(gl); QOpenGLTexture *texture = new QOpenGLTexture(image.mirrored()); m_glTextures.push_back(texture); return texture->textureId(); @@ -548,6 +550,7 @@ GLuint NaviCubeImplementation::createMenuTex(QtGLWidget* gl, bool forPicking) { #if !defined(HAVE_QT5_OPENGL) return gl->bindTexture(image); #else + Q_UNUSED(gl); QOpenGLTexture *texture = new QOpenGLTexture(image.mirrored()); m_glTextures.push_back(texture); return texture->textureId(); diff --git a/src/Gui/View3DInventor.cpp b/src/Gui/View3DInventor.cpp index 9d0c58d9ee..730246de1a 100644 --- a/src/Gui/View3DInventor.cpp +++ b/src/Gui/View3DInventor.cpp @@ -367,7 +367,7 @@ void View3DInventor::OnChange(ParameterGrp::SubjectType &rCaller,ParameterGrp::M _viewer->setEnabledNaviCube(rGrp.GetBool("ShowNaviCube",true)); } else if (strcmp(Reason,"CornerNaviCube") == 0) { - _viewer->setNaviCubeCorner(rGrp.GetInt("CornerNaviCube",0)); + _viewer->setNaviCubeCorner(rGrp.GetInt("CornerNaviCube",1)); } else if (strcmp(Reason,"UseVBO") == 0) { _viewer->setEnabledVBO(rGrp.GetBool("UseVBO",false));