From 4ac056f3c57c9386b0ba65d331f62b23aafbb8e4 Mon Sep 17 00:00:00 2001 From: codeanticode Date: Wed, 16 Jan 2013 16:59:06 +0000 Subject: [PATCH] PGL.threadIsCurrent() is not static to avoid problems with subclassed renderers --- core/src/processing/opengl/PGL.java | 2 +- core/src/processing/opengl/PGraphicsOpenGL.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/processing/opengl/PGL.java b/core/src/processing/opengl/PGL.java index 3ccc10072..4a01d1999 100644 --- a/core/src/processing/opengl/PGL.java +++ b/core/src/processing/opengl/PGL.java @@ -1203,7 +1203,7 @@ public class PGL { } - protected static boolean glThreadIsCurrent() { + protected boolean threadIsCurrent() { return Thread.currentThread() == glThread; } diff --git a/core/src/processing/opengl/PGraphicsOpenGL.java b/core/src/processing/opengl/PGraphicsOpenGL.java index fb0ee355d..29335067d 100644 --- a/core/src/processing/opengl/PGraphicsOpenGL.java +++ b/core/src/processing/opengl/PGraphicsOpenGL.java @@ -5741,7 +5741,7 @@ public class PGraphicsOpenGL extends PGraphics { protected boolean checkGLThread() { - if (PGL.glThreadIsCurrent()) { + if (pgl.threadIsCurrent()) { return true; } else { PGraphics.showWarning(OPENGL_THREAD_ERROR);