Merge branch 'dev-touch-fix' into dev
commit 62c101c805acd783b32faf0ddf7344ecd6c35ec6
2 parents f96a387 + 5951cda
@Mat Groves Mat Groves authored on 30 Apr 2016
Showing 3 changed files
View
src/core/renderers/webgl/WebGLRenderer.js
View
src/filters/displacement/displacement.frag
View
src/filters/displacement/displacement.vert