WebGLShadowMap: Reworked useMorphing check code.

mrdoob · Jun 24, 2016 · 74b3522 · 74b3522 · mrdoob · Jun 24, 2016
1 parent 1a984f9
commit 74b3522
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/renderers/webgl/WebGLShadowMap.js b/src/renderers/webgl/WebGLShadowMap.js
@@ -312,15 +312,19 @@ THREE.WebGLShadowMap = function ( _renderer, _lights, _objects ) {
 
 		if ( ! customMaterial ) {
 
-			var useMorphing, morphTargets;
+			var useMorphing = false;
 
 			if ( material.morphTargets ) {
 
-				if ( geometry instanceof THREE.Geometry ) morphTargets = geometry.morphTargets;
+				if ( geometry instanceof THREE.BufferGeometry ) {
 
-				if ( geometry instanceof THREE.BufferGeometry && geometry.morphAttributes !== undefined ) morphTargets = geometry.morphAttributes.position;
+					useMorphing = geometry.morphAttributes && geometry.morphAttributes.position && geometry.morphAttributes.position.length > 0;
 
-				if ( morphTargets !== undefined && morphTargets.length > 0 ) useMorphing = true;
+				} else if ( geometry instanceof THREE.Geometry ) {
+
+					useMorphing = geometry.morphTargets && geometry.morphTargets.length > 0;
+
+				}
 
 			}