Browse Source

Merge branch 'master' of https://github.com/rennat/three.js into dev

Mr.doob 11 years ago
parent
commit
0fd96d6d1d
1 changed files with 1 additions and 1 deletions
  1. 1 1
      src/extras/renderers/plugins/DepthPassPlugin.js

+ 1 - 1
src/extras/renderers/plugins/DepthPassPlugin.js

@@ -121,7 +121,7 @@ THREE.DepthPassPlugin = function () {
 
 
 				if ( objectMaterial ) _renderer.setMaterialFaces( object.material );
 				if ( objectMaterial ) _renderer.setMaterialFaces( object.material );
 
 
-				useMorphing = object.geometry.morphTargets.length > 0 && objectMaterial.morphTargets;
+				useMorphing = typeof(object.geometry.morphTargets) !== 'undefined' && object.geometry.morphTargets.length > 0 && objectMaterial.morphTargets;
 				useSkinning = object instanceof THREE.SkinnedMesh && objectMaterial.skinning;
 				useSkinning = object instanceof THREE.SkinnedMesh && objectMaterial.skinning;
 
 
 				if ( object.customDepthMaterial ) {
 				if ( object.customDepthMaterial ) {