hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #191 from CarVac/master

Browse Source 
Fixed an OpenGL error; just a stopgap it seems.
This commit is contained in:
kruland2607 2014-03-18 21:35:56 -05:00
commit ddc04b00a0
3 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/resources/datafiles/thrustcurves/thrustcurves.ser
View File

Binary file not shown.

BIN
swing/resources/datafiles/presets/system.ser
View File

Binary file not shown.

2
swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoPanel.java
View File

@ -465,7 +465,7 @@ public class PhotoPanel extends JPanel implements GLEventListener {
@Override @Override
public void init(final GLAutoDrawable drawable) { public void init(final GLAutoDrawable drawable) {
log.trace("GL - init()"); log.trace("GL - init()");
drawable.setGL(new DebugGL2(drawable.getGL().getGL2())); //drawable.setGL(new DebugGL2(drawable.getGL().getGL2()));
final GL2 gl = drawable.getGL().getGL2(); final GL2 gl = drawable.getGL().getGL2();