Browse Source

Loader: Robustness. See #6197.

Mr.doob 10 years ago
parent
commit
5f009a9c49
1 changed files with 9 additions and 5 deletions
  1. 9 5
      src/loaders/Loader.js

+ 9 - 5
src/loaders/Loader.js

@@ -225,11 +225,15 @@ THREE.Loader.prototype = {
 			mpars.blending = THREE[ m.blending ];
 			mpars.blending = THREE[ m.blending ];
 
 
 		}
 		}
-
-		if ( m.transparent !== undefined || m.opacity < 1.0 ) {
+		
+		if ( m.transparent !== undefined ) {
 
 
 			mpars.transparent = m.transparent;
 			mpars.transparent = m.transparent;
 
 
+		} else if ( m.opacity < 1.0 ) {
+
+			mpars.transparent = true;
+
 		}
 		}
 
 
 		if ( m.depthTest !== undefined ) {
 		if ( m.depthTest !== undefined ) {
@@ -308,14 +312,14 @@ THREE.Loader.prototype = {
 
 
 		// modifiers
 		// modifiers
 
 
-		if ( m.transparency ) {
+		if ( m.transparency !== undefined ) {
 
 
 			console.warn( 'THREE.Loader: transparency has been renamed to opacity' );
 			console.warn( 'THREE.Loader: transparency has been renamed to opacity' );
-			mpars.opacity = m.transparency;
+			m.opacity = m.transparency;
 
 
 		}
 		}
 
 
-		if ( m.opacity ) {
+		if ( m.opacity !== undefined ) {
 
 
 			mpars.opacity = m.opacity;
 			mpars.opacity = m.opacity;