diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-22 15:26:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-22 15:26:15 +0200 |
| commit | 260e33178cf11353dfbc208110322cc65718a7c9 (patch) | |
| tree | f7ee388db0fa71a99beb8c4d3ef1dc335919474f | |
| parent | 8a4e05a440d53be6247ee14c6b4928c07b4a83ae (diff) | |
| parent | 0a14e78a60f227c6415f14be4c6b14f4587e26ab (diff) | |
Merge pull request #10543 from hpvb/fix-10524
Change order of Null check for ParallaxLayer
| -rw-r--r-- | scene/2d/parallax_layer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/2d/parallax_layer.cpp b/scene/2d/parallax_layer.cpp index 4b62d70648..debdc22b65 100644 --- a/scene/2d/parallax_layer.cpp +++ b/scene/2d/parallax_layer.cpp @@ -34,11 +34,11 @@ void ParallaxLayer::set_motion_scale(const Size2 &p_scale) { + motion_scale = p_scale; + if (!get_parent()) return; - motion_scale = p_scale; - ParallaxBackground *pb = get_parent()->cast_to<ParallaxBackground>(); if (is_inside_tree() && pb) { Vector2 ofs = pb->get_final_offset(); @@ -54,11 +54,11 @@ Size2 ParallaxLayer::get_motion_scale() const { void ParallaxLayer::set_motion_offset(const Size2 &p_offset) { + motion_offset = p_offset; + if (!get_parent()) return; - motion_offset = p_offset; - ParallaxBackground *pb = get_parent()->cast_to<ParallaxBackground>(); if (is_inside_tree() && pb) { Vector2 ofs = pb->get_final_offset(); |