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.

Sign up for GitHub

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

Jump to bottom

Remove non-ENERGY_PRESERVATION code #17176

Merged
merged 2 commits into from
Aug 6, 2019
Merged

Remove non-ENERGY_PRESERVATION code #17176

merged 2 commits into from
Aug 6, 2019

Conversation

sunag
Copy link
Collaborator

@sunag sunag commented Aug 6, 2019

@mrdoob mrdoob added this to the r108 milestone Aug 6, 2019
@mrdoob
Copy link
Owner

mrdoob commented Aug 6, 2019

Merging this for now. We can add it back if needed.

@mrdoob mrdoob merged commit 91757a7 into mrdoob:dev Aug 6, 2019
@mrdoob
Copy link
Owner

mrdoob commented Aug 6, 2019

Thanks!

@mrdoob
Copy link
Owner

mrdoob commented Aug 8, 2019

I think this PR (and/or #17163) broke the furnace test:

https://raw.githack.com/mrdoob/three.js/dev/examples/webgl_furnace_test.html

Screen Shot 2019-08-07 at 5 58 25 PM

Good:
https://threejs.org/examples/webgl_furnace_test.html

@sunag
Copy link
Collaborator Author

sunag commented Aug 8, 2019

This was a code conflict with this PR #17079 I will fix.

sunag added a commit to sunag/three.js that referenced this pull request Aug 8, 2019
@sunag
fix merger conflict mrdoob#17176
6af67e2
@sunag sunag mentioned this pull request Aug 8, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
r108
Development

Successfully merging this pull request may close these issues.
2 participants
@sunag @mrdoob