|
@@ -798,9 +798,8 @@ THREE.WebGLRenderer = function ( parameters ) {
|
|
|
var geometry = objects.update( object );
|
|
|
var program = setProgram( camera, lights, fog, material, object );
|
|
|
|
|
|
- var updateBuffers = false,
|
|
|
- wireframeBit = material.wireframe ? 1 : 0,
|
|
|
- geometryProgram = geometry.id + '_' + program.id + '_' + wireframeBit;
|
|
|
+ var updateBuffers = false;
|
|
|
+ var geometryProgram = geometry.id + '_' + program.id + '_' + material.wireframe;
|
|
|
|
|
|
if ( geometryProgram !== _currentGeometryProgram ) {
|
|
|
|
|
@@ -869,7 +868,7 @@ THREE.WebGLRenderer = function ( parameters ) {
|
|
|
|
|
|
if ( object instanceof THREE.Mesh ) {
|
|
|
|
|
|
- renderMesh( material, geometry, object, program, updateBuffers, materialIndex );
|
|
|
+ renderMesh( material, geometry, program, updateBuffers, materialIndex );
|
|
|
|
|
|
} else if ( object instanceof THREE.Line ) {
|
|
|
|
|
@@ -877,7 +876,7 @@ THREE.WebGLRenderer = function ( parameters ) {
|
|
|
|
|
|
} else if ( object instanceof THREE.PointCloud ) {
|
|
|
|
|
|
- renderPointCloud( material, geometry, object, program, updateBuffers, materialIndex );
|
|
|
+ renderPointCloud( material, geometry, program, updateBuffers, materialIndex );
|
|
|
|
|
|
}
|
|
|
|
|
@@ -1014,7 +1013,7 @@ THREE.WebGLRenderer = function ( parameters ) {
|
|
|
|
|
|
}
|
|
|
|
|
|
- function renderMesh( material, geometry, object, program, updateBuffers, materialIndex ) {
|
|
|
+ function renderMesh( material, geometry, program, updateBuffers, materialIndex ) {
|
|
|
|
|
|
var mode = _gl.TRIANGLES;
|
|
|
|
|
@@ -1346,7 +1345,7 @@ THREE.WebGLRenderer = function ( parameters ) {
|
|
|
|
|
|
}
|
|
|
|
|
|
- function renderPointCloud( material, geometry, object, program, updateBuffers, materialIndex ) {
|
|
|
+ function renderPointCloud( material, geometry, program, updateBuffers, materialIndex ) {
|
|
|
|
|
|
var mode = _gl.POINTS;
|
|
|
|