Merge pull request #14693 from Mugen87/dev17

mrdoob · web-flow · commit f5d6296e57bf · 2018-08-14T13:16:44.000-07:00
ShaderMaterial: Added defines to .toJSON()
diff --git a/src/loaders/MaterialLoader.js b/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;
 
diff --git a/src/materials/ShaderMaterial.js b/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;
 

Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,7 @@ Object.assign( MaterialLoader.prototype, {`
`146`	`146`
`147`	`147`	`}`
`148`	`148`
	`149`	`+ if ( json.defines !== undefined ) material.defines = json.defines;`
`149`	`150`	`if ( json.vertexShader !== undefined ) material.vertexShader = json.vertexShader;`
`150`	`151`	`if ( json.fragmentShader !== undefined ) material.fragmentShader = json.fragmentShader;`
`151`	`152`
Original file line number	Diff line number	Diff line change
`@@ -177,6 +177,8 @@ ShaderMaterial.prototype.toJSON = function ( meta ) {`
`177`	`177`
`178`	`178`	`}`
`179`	`179`
	`180`	`+ if ( Object.keys( this.defines ).length > 0 ) data.defines = this.defines;`
	`181`	`+`
`180`	`182`	`data.vertexShader = this.vertexShader;`
`181`	`183`	`data.fragmentShader = this.fragmentShader;`
`182`	`184`