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

More careful splitting of glTF materials #6421

Merged
merged 6 commits into from Apr 4, 2018
Merged

Conversation

emackey
Copy link
Contributor

@emackey emackey commented Apr 3, 2018

This addresses a bug found in #6412 where Polly, the robot dog, lost all her lighting, even emissive lights.

Some materials were used with and without tangents, or with and without morph targets, and needed to be split apart. Also, the hasTangents and hasMorphTargets booleans needed to be isolated to their respective materials (after splitting).

@cesium-concierge
Copy link

Signed CLA is on file.

@emackey, thanks for the pull request! Maintainers, we have a signed CLA from @emackey, so you can review this at any time.

⚠️ I noticed that CHANGES.md has not been updated. If this change updates the public API in any way, fixes a bug, or makes any non-trivial update, please add a bullet point to CHANGES.md and comment on this pull request so we know it was updated. For more info, see the Pull Request Guidelines.

⚠️ I noticed that a file in one of our ThirdParty folders (ThirdParty/, Source/ThirdParty/) has been added or modified. Please verify that it has a section in LICENSE.md and that its license information is up to date with this new version. Once you do, please confirm by commenting on this pull request.


I am a bot who helps you make Cesium awesome! Contributions to my configuration are welcome.

🌍 🌎 🌏

@lilleyse
Copy link
Contributor

lilleyse commented Apr 4, 2018

@emackey looks good, just update CHANGES.md.

@emackey
Copy link
Contributor Author

emackey commented Apr 4, 2018

Actually, going to add one more tweak here, hold on...

@emackey
Copy link
Contributor Author

emackey commented Apr 4, 2018

Updated. Now fixes #6061.

This is ready.

@lilleyse
Copy link
Contributor

lilleyse commented Apr 4, 2018

Nice - Polly and Alien work great.

@lilleyse lilleyse merged commit 091200c into master Apr 4, 2018
@lilleyse lilleyse deleted the per-material-bools branch April 4, 2018 16:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants