From e964be56c4141ab6ef5b39ee4882957d64a767d7 Mon Sep 17 00:00:00 2001 From: ckline Date: Sun, 22 Jun 2003 21:11:18 +0000 Subject: Fixed a bug where insideBeginEndPair was not being checked within checkGLGetError(). This is a bugfix by kbr that was not accidentally not merged from the Jungle codebase to the Jogl codebase. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@9 232f8b59-042b-4e1e-8c03-345bb8c30851 --- src/net/java/games/gluegen/opengl/BuildComposablePipeline.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/net/java/games/gluegen/opengl/BuildComposablePipeline.java b/src/net/java/games/gluegen/opengl/BuildComposablePipeline.java index 90ec97113..47476a54c 100644 --- a/src/net/java/games/gluegen/opengl/BuildComposablePipeline.java +++ b/src/net/java/games/gluegen/opengl/BuildComposablePipeline.java @@ -355,6 +355,10 @@ public class BuildComposablePipeline { output.println(" private void checkGLGetError(String caller)"); output.println(" {"); + output.println(" if (insideBeginEndPair) {"); + output.println(" return;"); + output.println(" }"); + output.println(); output.println(" // Debug code to make sure the pipeline is working; leave commented out unless testing this class"); output.println(" //System.err.println(\"Checking for GL errors " + "after call to \" + caller + \"()\");"); -- cgit v1.2.3