From 0b3e81bb2a6b20b0e3476d9cf9e33fd1eab66099 Mon Sep 17 00:00:00 2001 From: Billy Olsen Date: Sun, 6 Jun 2021 19:54:37 -0700 Subject: [PATCH] Don't switch to use GLJPanel always Relying primarily on the FBO option for capabilities passed to the GLJPanel interferes with the part picking algorithm. Revert that piece of the fix. Fixes #937 Signed-off-by: Billy Olsen --- .../net/sf/openrocket/gui/figure3d/RocketFigure3d.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java b/swing/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java index 26518c290..bdc286829 100644 --- a/swing/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java +++ b/swing/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java @@ -158,14 +158,12 @@ public class RocketFigure3d extends JPanel implements GLEventListener { } if (Application.getPreferences().getBoolean(Preferences.OPENGL_USE_FBO, false)) { - log.trace("GL - enabling FBO"); - caps.setFBO(true); + log.trace("GL - Creating GLJPanel"); + canvas = new GLJPanel(caps); } else { - log.trace("GL - disabling FBO"); - caps.setFBO(false); + log.trace("GL - Creating GLCanvas"); + canvas = new GLCanvas(caps); } - log.trace("GL - Creating GLJPanel"); - canvas = new GLJPanel(caps); log.trace("GL - Registering as GLEventListener on canvas"); ((GLAutoDrawable) canvas).addGLEventListener(this);