Merge pull request processing#2869 from liam-middlebrook/feature/uniformMessageFix

codeanticode · codeanticode · commit 9a0369cdbbb1 · 2014-09-24T09:40:46.000-04:00
Refined PShader uniform missing message fixes processing#2593
diff --git a/core/src/processing/opengl/PShader.java b/core/src/processing/opengl/PShader.java
@@ -753,7 +753,8 @@ protected void setUniformImpl(String name, int type, Object value) {
       uniformValues.put(loc, new UniformValue(type, value));
     } else {
       PGraphics.showWarning("The shader doesn't have a uniform called \"" +
-                            name + "\"");
+                            name + "\" OR the uniform was removed during" +
+                            "compilation because it was unused.");
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -753,7 +753,8 @@ protected void setUniformImpl(String name, int type, Object value) {`
`753`	`753`	`uniformValues.put(loc, new UniformValue(type, value));`
`754`	`754`	`} else {`
`755`	`755`	`PGraphics.showWarning("The shader doesn't have a uniform called \"" +`
`756`		`- name + "\"");`
	`756`	`+ name + "\" OR the uniform was removed during" +`
	`757`	`+ "compilation because it was unused.");`
`757`	`758`	`}`
`758`	`759`	`}`
`759`	`760`