diff options
author | Sven Gothel <[email protected]> | 2019-03-26 23:17:53 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2019-03-26 23:17:53 +0100 |
commit | 2319a207873cf88da4ce0dadc5e7a2e5479d4254 (patch) | |
tree | 045174c1ca2bdf25a44bf00f690b3fd73bf065ea /src/jogl/classes/com/jogamp/opengl/util | |
parent | 2f11b888b65452e9e08634ab377862b5ecb0c25d (diff) |
Bug 1283: Remove shader include filename quotes if exists at start and end only
Diffstat (limited to 'src/jogl/classes/com/jogamp/opengl/util')
-rw-r--r-- | src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java index e674bc911..0be42e895 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java +++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java @@ -1098,7 +1098,15 @@ public class ShaderCode { while ((line = reader.readLine()) != null) { lineno++; if (line.startsWith("#include ")) { - final String includeFile = line.substring(9).trim().replace("\"", ""); + final String includeFile; + { + String s = line.substring(9).trim(); + // Bug 1283: Remove shader include filename quotes if exists at start and end only + if( s.startsWith("\"") && s.endsWith("\"")) { + s = s.substring(1, s.length()-1); + } + includeFile = s; + } URLConnection nextConn = null; // Try relative of current shader location |