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

Fix generating model shaders for case where material is not used by a primitve #6315

Merged
merged 3 commits into from
Mar 13, 2018

Conversation

lilleyse
Copy link
Contributor

@lilleyse lilleyse commented Mar 9, 2018

Fixes https://groups.google.com/forum/#!topic/cesium-dev/xat4Uy4sabQ

CC CesiumGS/gltf-pipeline#351

extras._pipeline.primitive is only created if a primitive uses the material. The model linked in the forum post had a material that wasn't being used by any primitives which triggered an edge case in the shader generation code.

@cesium-concierge
Copy link

Signed CLA is on file.

@lilleyse, thanks for the pull request! Maintainers, we have a signed CLA from @lilleyse, 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.

🌍 🌎 🌏

@pjcozzi
Copy link
Contributor

pjcozzi commented Mar 11, 2018

@shehzan10 could you please look at this?

@lilleyse do you need to update CHANGES.md or add any tests?

@shehzan10
Copy link
Member

This looks fine to me (pending any update to CHANGES.md or tests).

I do not have commit access to Cesium, so I won't be able to merge this.

@pjcozzi
Copy link
Contributor

pjcozzi commented Mar 12, 2018

Thanks @shehzan10.

Waiting on

@lilleyse do you need to update CHANGES.md or add any tests?

@lilleyse
Copy link
Contributor Author

Updated CHANGES.md. I'll add a test to gltf-pipeline.

@pjcozzi pjcozzi merged commit 6a53d84 into master Mar 13, 2018
@cesium-concierge
Copy link

Congratulations on closing the issue! I found these Cesium forum links in the comments above:

https://groups.google.com/forum/#!topic/cesium-dev/xat4Uy4sabQ

If this issue affects any of these threads, please post a comment like the following:

The issue at #6315 has just been closed and may resolve your issue. Look for the change in the next stable release of Cesium or get it now in the master branch on GitHub https://github.com/AnalyticalGraphicsInc/cesium.


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

🌍 🌎 🌏

@pjcozzi pjcozzi deleted the material-bug-fix branch March 13, 2018 12:49
@pjcozzi
Copy link
Contributor

pjcozzi commented Mar 13, 2018

@lilleyse please update the forum.

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.

4 participants