Browse Source

Merge pull request #14693 from Mugen87/dev17

ShaderMaterial: Added defines to .toJSON()
Mr.doob 7 years ago
parent
commit
f5d6296e57
2 changed files with 3 additions and 0 deletions
  1. 1 0
      src/loaders/MaterialLoader.js
  2. 2 0
      src/materials/ShaderMaterial.js

+ 1 - 0
src/loaders/MaterialLoader.js

@@ -146,6 +146,7 @@ Object.assign( MaterialLoader.prototype, {
 
 		}
 
+		if ( json.defines !== undefined ) material.defines = json.defines;
 		if ( json.vertexShader !== undefined ) material.vertexShader = json.vertexShader;
 		if ( json.fragmentShader !== undefined ) material.fragmentShader = json.fragmentShader;
 

+ 2 - 0
src/materials/ShaderMaterial.js

@@ -177,6 +177,8 @@ ShaderMaterial.prototype.toJSON = function ( meta ) {
 
 	}
 
+	if ( Object.keys( this.defines ).length > 0 ) data.defines = this.defines;
+
 	data.vertexShader = this.vertexShader;
 	data.fragmentShader = this.fragmentShader;