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

Merge pull request #10544 from hpvb/fix-10524-2.1

Browse Source 
[2.1] Change order of Null check for ParallaxLayer
This commit is contained in:
Rémi Verschelde 2017-08-22 15:26:18 +02:00 committed by GitHub
commit fb90ac8e48
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scene/2d/parallax_layer.cpp
View File

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