Browse Source

Material: Remove unnecessary conditional branch. From @cjshannon.
Sorry, I couldn't merge cleanly nor cherry-pick.

Mr.doob 12 years ago
parent
commit
31b77223f0
1 changed files with 1 additions and 5 deletions
  1. 1 5
      src/materials/Material.js

+ 1 - 5
src/materials/Material.js

@@ -65,11 +65,7 @@ THREE.Material.prototype = {
 
 				var currentValue = this[ key ];
 
-				if ( currentValue instanceof THREE.Color && newValue instanceof THREE.Color ) {
-
-					currentValue.copy( newValue );
-
-				} else if ( currentValue instanceof THREE.Color ) {
+				if ( currentValue instanceof THREE.Color ) {
 
 					currentValue.set( newValue );