eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-22 14:55:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:processing/processing

Browse Source
This commit is contained in:
Ben Fry
2015-05-19 18:14:16 -04:00
parent 2b12f969a6 29f790a3b5
commit dc60d801f5
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/processing/opengl/PGraphicsOpenGL.java
View File

@@ -158,7 +158,7 @@ public class PGraphicsOpenGL extends PGraphics {
static protected URL defColorShaderVertURL =
PGraphicsOpenGL.class.getResource("ColorVert.glsl");
static protected URL defTextureShaderVertURL =
PGraphicsOpenGL.class.getResource("TextureVert.glsl");
PGraphicsOpenGL.class.getResource("TexVert.glsl");
static protected URL defLightShaderVertURL =
PGraphicsOpenGL.class.getResource("LightVert.glsl");
static protected URL defTexlightShaderVertURL =
@@ -166,7 +166,7 @@ public class PGraphicsOpenGL extends PGraphics {
static protected URL defColorShaderFragURL =
PGraphicsOpenGL.class.getResource("ColorFrag.glsl");
static protected URL defTextureShaderFragURL =
PGraphicsOpenGL.class.getResource("TextureFrag.glsl");
PGraphicsOpenGL.class.getResource("TexFrag.glsl");
static protected URL defLightShaderFragURL =
PGraphicsOpenGL.class.getResource("LightFrag.glsl");
static protected URL defTexlightShaderFragURL =

0
core/src/processing/opengl/TextureFrag.glsl → core/src/processing/opengl/TexFrag.glsl
View File

0
core/src/processing/opengl/TextureVert.glsl → core/src/processing/opengl/TexVert.glsl
View File