Ver Fonte

Remove some defensive checks. Change | 0 to parseInt.

manthrax há 8 anos atrás
pai
commit
1ea1301234
2 ficheiros alterados com 4 adições e 18 exclusões
  1. 3 17
      editor/js/Editor.js
  2. 1 1
      editor/js/Sidebar.Material.js

+ 3 - 17
editor/js/Editor.js

@@ -351,14 +351,7 @@ Editor.prototype = {
 
 
 		var material = object.material;
 		var material = object.material;
 
 
-		if( Array.isArray( material ) == true){
-			var slot = slot | 0;
-
-			if(slot <  0) slot = 0;
-			else if(slot >= material.length) slot = material.length;
-
-			material = material[ slot ];
-		}
+		if( Array.isArray( material ) == true) material = material[ slot ];
 		
 		
 		return material;
 		return material;
 
 
@@ -368,15 +361,8 @@ Editor.prototype = {
 
 
 		var material = object.material;
 		var material = object.material;
 
 
-		if( Array.isArray( material ) == true){
-			var slot = this.materialSlot | 0;
-
-			if(slot <  0) slot = 0;
-			else if(slot >= material.length) slot = material.length;
-
-			material[ slot ] = newMaterial;
-		}else
-			object.material = newMaterial;
+		if( Array.isArray( material ) == true) material[ slot ] = newMaterial;
+		else object.material = newMaterial;
 	},
 	},
 
 
 	//
 	//

+ 1 - 1
editor/js/Sidebar.Material.js

@@ -513,7 +513,7 @@ Sidebar.Material = function ( editor ) {
 
 
 		var previousSelectedSlot = currentMaterialSlot;
 		var previousSelectedSlot = currentMaterialSlot;
 
 
-		currentMaterialSlot = materialSlotSelect.getValue() | 0;
+		currentMaterialSlot = parseInt( materialSlotSelect.getValue() );
 
 
 		if( currentMaterialSlot != previousSelectedSlot )
 		if( currentMaterialSlot != previousSelectedSlot )
 			refreshUI(true);
 			refreshUI(true);