Skip to content

Commit f8b192c

Browse files
author
lauren mccarthy
committed
adding check to prevent tint/webcam conflict issue #410
1 parent 85d487c commit f8b192c

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

lib/p5.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! p5.js v0.3.10 October 28, 2014 */
1+
/*! p5.js v0.3.10 November 01, 2014 */
22
var shim = function (require) {
33
window.requestDraw = function () {
44
return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || window.oRequestAnimationFrame || window.msRequestAnimationFrame || function (callback, element) {
@@ -2230,7 +2230,7 @@ var imageloading_displaying = function (require, core, filters, canvas, constant
22302230
height = img.height;
22312231
}
22322232
var vals = canvas.modeAdjust(x, y, width, height, this._imageMode);
2233-
if (this._tint) {
2233+
if (this._tint && img.canvas) {
22342234
this.drawingContext.drawImage(this._getTintedImageCanvas(img), vals.x, vals.y, vals.w, vals.h);
22352235
} else {
22362236
this.drawingContext.drawImage(frame, vals.x, vals.y, vals.w, vals.h);

0 commit comments

Comments
 (0)