From dbeb3cf2ed6d4afe6a52899367951383a11cf2d5 Mon Sep 17 00:00:00 2001 From: Asturur Date: Wed, 16 Aug 2017 10:09:48 +0200 Subject: [PATCH] fix shader pick --- src/filters/convolute_filter.class.js | 2 +- src/shapes/group.class.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/filters/convolute_filter.class.js b/src/filters/convolute_filter.class.js index 463a395ff93..deec6385997 100644 --- a/src/filters/convolute_filter.class.js +++ b/src/filters/convolute_filter.class.js @@ -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); diff --git a/src/shapes/group.class.js b/src/shapes/group.class.js index 46a2b9ae071..c134d53c310 100644 --- a/src/shapes/group.class.js +++ b/src/shapes/group.class.js @@ -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;