Skip to content

Commit

Permalink
fix shader pick (fabricjs#4207)
Browse files Browse the repository at this point in the history
  • Loading branch information
asturur authored and rkrueger11 committed Sep 6, 2017
1 parent 7b1d9dc commit f98726e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion src/filters/convolute_filter.class.js
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@
*/
retrieveShader: function(options) {
var size = Math.sqrt(this.matrix.length);
var cacheKey = this.type + '_' + size + '_' + this.opaque ? 1 : 0;
var cacheKey = this.type + '_' + size + '_' + (this.opaque ? 1 : 0);
var shaderSource = this.fragmentSource[cacheKey];
if (!options.programCache.hasOwnProperty(cacheKey)) {
options.programCache[cacheKey] = this.createProgram(options.context, shaderSource);
Expand Down
1 change: 0 additions & 1 deletion src/shapes/group.class.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
// we cannot change properties of objects.
// Thus we need to set options to group without objects,
isAlreadyGrouped && this.callSuper('initialize', options);

this._objects = objects || [];
for (var i = this._objects.length; i--; ) {
this._objects[i].group = this;
Expand Down

0 comments on commit f98726e

Please sign in to comment.