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

Finalist - Fix to remove webgl warnings resulted from blank texts in scatter3d #3171

Merged
merged 14 commits into from
Oct 29, 2018

Conversation

archmoj
Copy link
Contributor

@archmoj archmoj commented Oct 26, 2018

This PR is the continuation of PR 3133 in which the master changes are fetched and conflicts are resolved i.e. to test & make the process of merging easier.
This PR would resolve issue #704 .
@etpinard
@alexcjohnson

@archmoj archmoj added the bug something broken label Oct 26, 2018
package.json Outdated
@@ -80,7 +80,7 @@
"gl-plot2d": "^1.3.1",
"gl-plot3d": "^1.5.10",
"gl-pointcloud2d": "^1.0.1",
"gl-scatter3d": "^1.0.12",
"gl-scatter3d": "git://github.com/gl-vis/gl-scatter3d.git#8915d2ec6a89b7dc76e216487e82143dbc165c6f",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@etpinard
Copy link
Contributor

Thanks for adding that mock. Go ahead and merge this thing once tests pass

💃 💃 💃

@archmoj archmoj merged commit f23f84c into master Oct 29, 2018
@archmoj archmoj deleted the issue-704_fetch-master branch October 29, 2018 14:40
etpinard added a commit that referenced this pull request Oct 29, 2018
etpinard added a commit that referenced this pull request Oct 29, 2018

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Update package-lock for pr #3171
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug something broken
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants