Merge pull request #2236 from boubpopsyteam/patch-6

Make sure alpha param is used with color(gray, alpha) and 'g' is null
This commit is contained in:
Ben Fry
2014-01-21 16:44:12 -08:00
+1 -1
View File
@@ -10116,7 +10116,7 @@ public class PApplet extends Applet
int alpha = (int) falpha;
if (gray > 255) gray = 255; else if (gray < 0) gray = 0;
if (alpha > 255) alpha = 255; else if (alpha < 0) alpha = 0;
return 0xff000000 | (gray << 16) | (gray << 8) | gray;
return (alpha << 24) | (gray << 16) | (gray << 8) | gray;
}
return g.color(fgray, falpha);
}