Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Null uniform value serialization in ShaderMaterial.toJSON(). #15447

Merged
merged 1 commit into from Dec 18, 2018

Conversation

@takahirox
Copy link
Collaborator

commented Dec 18, 2018

Uniform value in ShaderMaterial can be null especially for texture (THREE.Texture or null). Then we need to check value is not null before checking value.is* in toJSON().

@takahirox takahirox changed the title Null uniform value serialization. Null uniform value serialization in ShaderMaterial.toJSON(). Dec 18, 2018

@mrdoob mrdoob added this to the r100 milestone Dec 18, 2018

@mrdoob mrdoob merged commit 403c506 into mrdoob:dev Dec 18, 2018

2 checks passed

LGTM analysis: JavaScript No alert changes
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@mrdoob

This comment has been minimized.

Copy link
Owner

commented Dec 18, 2018

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.