Browse Source

MaterialLoader: Handle flatShading. See #11724

Mr.doob 8 years ago
parent
commit
94aedce345
1 changed files with 5 additions and 1 deletions
  1. 5 1
      src/loaders/MaterialLoader.js

+ 5 - 1
src/loaders/MaterialLoader.js

@@ -68,7 +68,7 @@ Object.assign( MaterialLoader.prototype, {
 		if ( json.fragmentShader !== undefined ) material.fragmentShader = json.fragmentShader;
 		if ( json.vertexColors !== undefined ) material.vertexColors = json.vertexColors;
 		if ( json.fog !== undefined ) material.fog = json.fog;
-		if ( json.shading !== undefined ) material.shading = json.shading;
+		if ( json.flatShading !== undefined ) material.flatShading = json.flatShading;
 		if ( json.blending !== undefined ) material.blending = json.blending;
 		if ( json.side !== undefined ) material.side = json.side;
 		if ( json.opacity !== undefined ) material.opacity = json.opacity;
@@ -84,6 +84,10 @@ Object.assign( MaterialLoader.prototype, {
 		if ( json.skinning !== undefined ) material.skinning = json.skinning;
 		if ( json.morphTargets !== undefined ) material.morphTargets = json.morphTargets;
 
+		// Deprecated
+
+		if ( json.shading !== undefined ) material.shading = json.shading;
+
 		// for PointsMaterial
 
 		if ( json.size !== undefined ) material.size = json.size;