From debca05df449ed321389985f25a909bd76e06fbf Mon Sep 17 00:00:00 2001 From: Tobias Frost Date: Tue, 24 Dec 2024 09:33:33 +0100 Subject: [PATCH] Remove unused ifndefs for GL_MULTISAMPLE (found while searching for the build error on armhf/armel on Debian buildds, once resolved will make an additional PR for that.) $grep -r GL_MULTISAMPLE src/ yields: src/Mod/Sandbox/Gui/Overlay.cpp: #ifndef GL_MULTISAMPLE src/Mod/Sandbox/Gui/Overlay.cpp: #define GL_MULTISAMPLE 0x809D src/Mod/Sandbox/Gui/GLGraphicsView.cpp:#ifndef GL_MULTISAMPLE src/Mod/Sandbox/Gui/GLGraphicsView.cpp:#define GL_MULTISAMPLE 0x809D -> The defines are defined, but never used in the compilation unit --- src/Mod/Sandbox/Gui/GLGraphicsView.cpp | 4 ---- src/Mod/Sandbox/Gui/Overlay.cpp | 3 --- 2 files changed, 7 deletions(-) diff --git a/src/Mod/Sandbox/Gui/GLGraphicsView.cpp b/src/Mod/Sandbox/Gui/GLGraphicsView.cpp index a0136ee71f..afd4e560db 100644 --- a/src/Mod/Sandbox/Gui/GLGraphicsView.cpp +++ b/src/Mod/Sandbox/Gui/GLGraphicsView.cpp @@ -66,10 +66,6 @@ using namespace Gui; -#ifndef GL_MULTISAMPLE -#define GL_MULTISAMPLE 0x809D -#endif - // http://doc.qt.digia.com/qq/qq26-openglcanvas.html GraphicsView::GraphicsView() diff --git a/src/Mod/Sandbox/Gui/Overlay.cpp b/src/Mod/Sandbox/Gui/Overlay.cpp index d50db9df6d..b8df855acd 100644 --- a/src/Mod/Sandbox/Gui/Overlay.cpp +++ b/src/Mod/Sandbox/Gui/Overlay.cpp @@ -69,9 +69,6 @@ public: view->getSoRenderManager()->scheduleRedraw(); } - #ifndef GL_MULTISAMPLE - #define GL_MULTISAMPLE 0x809D - #endif void paintGL() { const SbViewportRegion vp = view->getSoRenderManager()->getViewportRegion();