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 bad merge in examples/gltf from PR.952 #967

Merged
merged 1 commit into from Mar 12, 2019

Conversation

Projects
None yet
3 participants
@georgios-uber
Copy link
Contributor

commented Mar 12, 2019

No description provided.

@georgios-uber georgios-uber self-assigned this Mar 12, 2019

@georgios-uber georgios-uber requested review from Pessimistress and ibgreen Mar 12, 2019

@georgios-uber georgios-uber merged commit 762df05 into master Mar 12, 2019

3 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
license/cla Contributor License Agreement is signed.
Details

@georgios-uber georgios-uber deleted the fix-bad-merge branch Mar 12, 2019

@ibgreen
Copy link
Contributor

left a comment

Sorry for the bad merge, and thanks for fixing it quickly.

urlOrPromise instanceof Promise
? urlOrPromise
: window
.fetch(urlOrPromise)

This comment has been minimized.

Copy link
@ibgreen

ibgreen Mar 12, 2019

Contributor
  • The suffix switching should no longer be needed.
  • GLTFParser.parse() now accepts both binary and text and checks whether the file is GLB or JSON, and does any necessary text and JSON decoding as necessary.

This comment has been minimized.

Copy link
@georgios-uber

georgios-uber Mar 12, 2019

Author Contributor

ok thanks.

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