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

Fix Issue 884 #889

Merged
merged 2 commits into from
Jun 20, 2013
Merged

Fix Issue 884 #889

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a7cc8a
Fix crash when morphing from 2D to 3D.
bagnell Jun 20, 2013
ec3f6c1
Updates based on review.
bagnell Jun 20, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Source/Scene/SceneTransitioner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,6 @@ define([
return;
}
this.onTransitionStart.raiseEvent(this, this._previousMode, SceneMode.SCENE3D, true);
this._previousMode = SceneMode.MORPHING;

Copy link
Contributor

Choose a reason for hiding this comment

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

Lines 242 and 269 have the same code. Does it have to be removed there as well? I also need to make sure that this doesn't break anything else (SceneModePicker for instances).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, I removed them. I don't think the map jumps to being partly off screen anymore (#513). Could you test that too?

Copy link
Contributor

Choose a reason for hiding this comment

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

#513 still happens for me, even with these changes.

updateFrustums(this);
scene.mode = SceneMode.MORPHING;
Expand Down