Fixed error with models when globe is undefined #5655
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@mramato Can you review when you get a chance? (I can't assign reviewers directly) |
|
This looks good to me @ggetz! It looks like |
|
@hpinkos Sure |
|
@hpinkos Updated! |
|
@ggetz merge in master |
|
@hpinkos Merged! |
hpinkos
reviewed
Jul 20, 2017
Source/Scene/Model.js
Outdated
| @@ -528,7 +528,7 @@ define([ | |||
| this._removeUpdateHeightCallback = undefined; | |||
| var scene = options.scene; | |||
| this._scene = scene; | |||
| if (defined(scene)) { | |||
| if (defined(scene) && defined(scene.terrainProviderChanged)) { | |||
| scene.terrainProviderChanged.addEventListener(function() { | |||
There was a problem hiding this comment.
This event listener needs to be removed in Model.prototype.destroy
|
And add specs. And after that I think this will be ready =) |
|
Thanks @hpinkos, updated! |
|
@hpinkos Could you take another look at this when you get the chance? |
hpinkos
reviewed
Aug 7, 2017
CHANGES.md
Outdated
| @@ -40,6 +41,8 @@ Change Log | |||
| * Updated `Billboard`, `Label` and `PointPrimitive` constructors to clone `NearFarScale` parameters [#5654](https://github.com/AnalyticalGraphicsInc/cesium/pull/5654) | |||
| * Added `FrustumGeometry` and `FrustumOutlineGeometry`. [#5649](https://github.com/AnalyticalGraphicsInc/cesium/pull/5649) | |||
| * Added an `options` parameter to the constructors of `PerspectiveFrustum`, `PerspectiveOffCenterFrustum`, `OrthographicFrustum`, and `OrthographicOffCenterFrustum` to set properties. [#5649](https://github.com/AnalyticalGraphicsInc/cesium/pull/5649) | |||
| * Added `ClassificationPrimitive` which defines a volume and draws the intersection of the volume and terrain or 3D Tiles. [#5625](https://github.com/AnalyticalGraphicsInc/cesium/pull/5625) | |||
| * Fix for dynamic polylines with polyline dash material [#5681](https://github.com/AnalyticalGraphicsInc/cesium/pull/5681) | |||
|
Fixed, thanks! |
|
Thanks @ggetz ! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #5638
Has
Scene.jscheck ifglobeis defined before accessing it properties, and also hasModel.jscheck if theterrainProviderChangedevent is defined before subscribing.