未验证 提交 403c506a 编写于 作者: M Mr.doob 提交者: GitHub

Merge pull request #15447 from takahirox/NullUniformValueSerialization

Null uniform value serialization in ShaderMaterial.toJSON().
......@@ -123,42 +123,42 @@ ShaderMaterial.prototype.toJSON = function ( meta ) {
var uniform = this.uniforms[ name ];
var value = uniform.value;
if ( value.isTexture ) {
if ( value && value.isTexture ) {
data.uniforms[ name ] = {
type: 't',
value: value.toJSON( meta ).uuid
};
} else if ( value.isColor ) {
} else if ( value && value.isColor ) {
data.uniforms[ name ] = {
type: 'c',
value: value.getHex()
};
} else if ( value.isVector2 ) {
} else if ( value && value.isVector2 ) {
data.uniforms[ name ] = {
type: 'v2',
value: value.toArray()
};
} else if ( value.isVector3 ) {
} else if ( value && value.isVector3 ) {
data.uniforms[ name ] = {
type: 'v3',
value: value.toArray()
};
} else if ( value.isVector4 ) {
} else if ( value && value.isVector4 ) {
data.uniforms[ name ] = {
type: 'v4',
value: value.toArray()
};
} else if ( value.isMatrix4 ) {
} else if ( value && value.isMatrix4 ) {
data.uniforms[ name ] = {
type: 'm4',
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册