diff options
| author | Hein-Pieter van Braam <hp@tmm.cx> | 2017-08-22 01:47:22 +0200 |
|---|---|---|
| committer | Hein-Pieter van Braam <hp@tmm.cx> | 2017-08-22 01:48:24 +0200 |
| commit | 99617ae8dcf98395c5aae78acfe38373bfeb2994 (patch) | |
| tree | 4b4e58f4956210948314ebfab4304d88f375c81f /scene/2d | |
| parent | b3ff7ca62e3a431008466df3ef204934ee8cb497 (diff) | |
Add null check to ParallaxLayer get_parent() calls
This fixes #10515
Diffstat (limited to 'scene/2d')
| -rw-r--r-- | scene/2d/parallax_layer.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scene/2d/parallax_layer.cpp b/scene/2d/parallax_layer.cpp index a5a59252a9..4b62d70648 100644 --- a/scene/2d/parallax_layer.cpp +++ b/scene/2d/parallax_layer.cpp @@ -34,6 +34,9 @@ void ParallaxLayer::set_motion_scale(const Size2 &p_scale) { + if (!get_parent()) + return; + motion_scale = p_scale; ParallaxBackground *pb = get_parent()->cast_to<ParallaxBackground>(); @@ -51,6 +54,9 @@ Size2 ParallaxLayer::get_motion_scale() const { void ParallaxLayer::set_motion_offset(const Size2 &p_offset) { + if (!get_parent()) + return; + motion_offset = p_offset; ParallaxBackground *pb = get_parent()->cast_to<ParallaxBackground>(); |