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

MeshMatcapMaterial: Add support for vertex tangents #22248

Merged
merged 5 commits into from
Aug 3, 2021

Conversation

WestLangley
Copy link
Collaborator

Fixes #22245.

@WestLangley WestLangley added this to the r132 milestone Aug 2, 2021
@WestLangley
Copy link
Collaborator Author

Why am I getting all these extra commits? :/

@Mugen87
Copy link
Collaborator

Mugen87 commented Aug 2, 2021

The squash and merge option creates new commits which are different compared to the original ones. Hence, I create new branches for a feature or force-push to the latest commit on dev in order to avoid additional merge commits.

@WestLangley
Copy link
Collaborator Author

I assume this is mergeable...

Hopefully I fixed it for future PRs with git reset --hard upstream/dev...

@mrdoob mrdoob merged commit 4b8428e into mrdoob:dev Aug 3, 2021
@mrdoob
Copy link
Owner

mrdoob commented Aug 3, 2021

Thanks!

@WestLangley WestLangley deleted the dev_matcap_material branch August 3, 2021 10:55
mrdoob pushed a commit that referenced this pull request Aug 3, 2021
* Clean up

* Added vertex tangent support
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.

Matcap with Normal map not working on sketchfab gltf but works with gltf exported from blender
3 participants