From 84456cd860dce7fd3368b0a1c0c391637630fa2d Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Mon, 5 Jan 2015 08:17:29 +0900 Subject: [PATCH] WebGLRenderer: Code clean up. --- src/renderers/WebGLRenderer.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/renderers/WebGLRenderer.js b/src/renderers/WebGLRenderer.js index c754895109..6f2b2a9d57 100644 --- a/src/renderers/WebGLRenderer.js +++ b/src/renderers/WebGLRenderer.js @@ -3129,19 +3129,19 @@ THREE.WebGLRenderer = function ( parameters ) { object.__webglMorphTargetInfluences[ m ] = influences[ order[ m ] ]; m ++; + } } else { // find the most influencing - var influence, activeInfluenceIndices = []; + var activeInfluenceIndices = []; var influences = object.morphTargetInfluences; - var i, il = influences.length; - for ( i = 0; i < il; i ++ ) { + for ( var i = 0, il = influences.length; i < il; i ++ ) { - influence = influences[ i ]; + var influence = influences[ i ]; activeInfluenceIndices.push( [ influence, i ] ); @@ -3162,13 +3162,13 @@ THREE.WebGLRenderer = function ( parameters ) { }; - var influenceIndex, m = 0; + var m = 0; while ( m < material.numSupportedMorphTargets ) { if ( activeInfluenceIndices[ m ] ) { - influenceIndex = activeInfluenceIndices[ m ][ 1 ]; + var influenceIndex = activeInfluenceIndices[ m ][ 1 ]; if ( attributes[ 'morphTarget' + m ] >= 0 ) { @@ -3178,7 +3178,7 @@ THREE.WebGLRenderer = function ( parameters ) { } - if ( attributes[ 'morphNormal' + m ] >= 0 && material.morphNormals ) { + if ( material.morphNormals && attributes[ 'morphNormal' + m ] >= 0 ) { _gl.bindBuffer( _gl.ARRAY_BUFFER, geometryGroup.__webglMorphNormalsBuffers[ influenceIndex ] ); enableAttribute( attributes[ 'morphNormal' + m ] ); -- GitLab