Merge branch 'master' into dev
commit 1bb7b47909452a13e37740374429bc0ff2d9fd62
2 parents 02b157c + 7fcbb63
@Matt Karl Matt Karl authored on 29 Mar 2017
Showing 2 changed files
View
src/core/renderers/webgl/filters/Filter.js
View
src/core/renderers/webgl/managers/FilterManager.js