diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-08-20 12:55:46 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-20 12:55:46 -0300 |
| commit | 541fdffc0ab2115238fe9cedbf1c088b15f11fdf (patch) | |
| tree | 187c5d0278e5075907fef8a86b4d00d6a0b7161a /scene/2d/parallax_layer.cpp | |
| parent | 831e21e89ba0275b43b6a351e538256b8ce715a3 (diff) | |
| parent | 90b8a5b71ef79e0339826507c4b290f0c51b7cd2 (diff) | |
Merge pull request #10319 from neikeq/pr-engine-editor-hint
Adds Engine::is_editor_hint() method
Diffstat (limited to 'scene/2d/parallax_layer.cpp')
| -rw-r--r-- | scene/2d/parallax_layer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scene/2d/parallax_layer.cpp b/scene/2d/parallax_layer.cpp index 0e83b9aaae..a5a59252a9 100644 --- a/scene/2d/parallax_layer.cpp +++ b/scene/2d/parallax_layer.cpp @@ -28,6 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "parallax_layer.h" + +#include "engine.h" #include "parallax_background.h" void ParallaxLayer::set_motion_scale(const Size2 &p_scale) { @@ -111,7 +113,7 @@ void ParallaxLayer::set_base_offset_and_scale(const Point2 &p_offset, float p_sc if (!is_inside_tree()) return; - if (get_tree()->is_editor_hint()) + if (Engine::get_singleton()->is_editor_hint()) return; Point2 new_ofs = ((orig_offset + p_offset) * motion_scale) * p_scale + motion_offset; |