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 Issue 884 #889

Merged
merged 2 commits into from
Jun 20, 2013
Merged

Fix Issue 884 #889

merged 2 commits into from
Jun 20, 2013

Conversation

bagnell
Copy link
Contributor

@bagnell bagnell commented Jun 20, 2013

Fix crash when morphing from 2D to 3D. #884.

@@ -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.

@mramato
Copy link
Contributor

mramato commented Jun 20, 2013

@emackey I think this is fixed, can you try to reproduce it to make sure; since you are the one that originally found it.

@mramato
Copy link
Contributor

mramato commented Jun 20, 2013

Tests pass, merge when happy.

@emackey
Copy link
Contributor

emackey commented Jun 20, 2013

Looks good, thanks. Merging.

emackey added a commit that referenced this pull request Jun 20, 2013
@emackey emackey merged commit 2a07e7a into master Jun 20, 2013
@emackey emackey deleted the issue884 branch June 20, 2013 23:46
@pjcozzi pjcozzi mentioned this pull request Aug 27, 2013
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.

3 participants