From a09af3a5d33292d923c2c4ad7888ec1aa75f81bf Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Thu, 19 Apr 2012 21:22:34 +0200 Subject: [PATCH] CanvasRenderer and SVGRenderer fix. material === undefined instead of material === null. --- examples/canvas_materials.html | 1 - src/renderers/CanvasRenderer.js | 2 +- src/renderers/SVGRenderer.js | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/examples/canvas_materials.html b/examples/canvas_materials.html index acf4196a9e..3ac535a200 100644 --- a/examples/canvas_materials.html +++ b/examples/canvas_materials.html @@ -77,7 +77,6 @@ { material: new THREE.MeshDepthMaterial( { overdraw: true } ), doubleSided: false }, { material: new THREE.MeshNormalMaterial( { overdraw: true } ), doubleSided: false }, { material: new THREE.MeshBasicMaterial( { map: THREE.ImageUtils.loadTexture( 'textures/land_ocean_ice_cloud_2048.jpg' ) } ), doubleSided: false }, - { material: new THREE.MeshLambertMaterial( { map: THREE.ImageUtils.loadTexture( 'textures/land_ocean_ice_cloud_2048.jpg' ) } ), doubleSided: false }, { material: new THREE.MeshBasicMaterial( { envMap: THREE.ImageUtils.loadTexture( 'textures/envmap.png', new THREE.SphericalReflectionMapping() ) } ), doubleSided: false } ]; diff --git a/src/renderers/CanvasRenderer.js b/src/renderers/CanvasRenderer.js index 0dcd443ac2..fe7506a1d8 100644 --- a/src/renderers/CanvasRenderer.js +++ b/src/renderers/CanvasRenderer.js @@ -206,7 +206,7 @@ THREE.CanvasRenderer = function ( parameters ) { material = element.material; material = material instanceof THREE.MeshFaceMaterial ? element.faceMaterial : material; - if ( material === null || material.visible === false ) continue; + if ( material === undefined || material.visible === false ) continue; _bboxRect.empty(); diff --git a/src/renderers/SVGRenderer.js b/src/renderers/SVGRenderer.js index 67f8febd73..692d8429c4 100644 --- a/src/renderers/SVGRenderer.js +++ b/src/renderers/SVGRenderer.js @@ -111,7 +111,7 @@ THREE.SVGRenderer = function () { material = element.material; material = material instanceof THREE.MeshFaceMaterial ? element.faceMaterial : material; - if ( material === null || material.visible === false ) continue; + if ( material === undefined || material.visible === false ) continue; _bboxRect.empty(); -- GitLab