Merge branch 'dev-geometry-instanced-arrays' into dev-geometry-update
commit 8ce1f2c8b4e0dbb7caf05f4158ed6b2e592a7db8
2 parents a8091c7 + 7a8812b
@Mat Groves Mat Groves authored on 21 Feb 2017
Showing 8 changed files
View
src/core/index.js
View
src/core/renderers/webgl/ShaderManager.js
View
src/core/shader/Shader.js
View
src/core/shader/UniformGroup.js 0 → 100644
View
src/core/shader/generateUniformsSync2.js 0 → 100644
View
src/mesh/geometry/Attribute.js
View
src/mesh/geometry/Geometry.js
View
src/mesh/webgl/MeshRenderer.js