godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10525 from hpvb/fix-10515-2.1 

[2.1]  Add null check to ParallaxLayer get_parent() calls
This commit is contained in:
Rémi Verschelde 2017-08-22 08:08:33 +02:00 committed by GitHub
parent 813d82c54b f33e8d7793
commit 6fab2a6314
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scene/2d/parallax_layer.cpp
View File

@ -32,6 +32,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>();
@ -49,6 +52,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>();