asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #31844 from 2shady4u/TweenInSceneTree

Browse source 
Timer and Tween check if they are in SceneTree when starting
This commit is contained in:
Rémi Verschelde 2019-09-03 18:35:20 +02:00 committed by GitHub
commit 750f8d4926
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scene/animation/tween.cpp
View file

@ -783,10 +783,12 @@ float Tween::get_speed_scale() const {
} }
bool Tween::start() { bool Tween::start() {
ERR_FAIL_COND_V_MSG(!is_inside_tree(), false, "Tween was not added to the SceneTree!");
// Are there any pending updates? // Are there any pending updates?
if (pending_update != 0) { if (pending_update != 0) {
// Start the tweens after deferring // Start the tweens after deferring
call_deferred("start");
return true; return true;
} }

4
scene/gui/control.cpp
View file

@ -2149,9 +2149,7 @@ bool Control::has_focus() const {
void Control::grab_focus() { void Control::grab_focus() {
if (!is_inside_tree()) { ERR_FAIL_COND(!is_inside_tree());
ERR_FAIL_COND(!is_inside_tree());
}
if (data.focus_mode == FOCUS_NONE) { if (data.focus_mode == FOCUS_NONE) {
WARN_PRINT("This control can't grab focus. Use set_focus_mode() to allow a control to get focus."); WARN_PRINT("This control can't grab focus. Use set_focus_mode() to allow a control to get focus.");

3
scene/main/timer.cpp
View file

@ -107,6 +107,9 @@ bool Timer::has_autostart() const {
} }
void Timer::start(float p_time) { void Timer::start(float p_time) {
ERR_FAIL_COND_MSG(!is_inside_tree(), "Timer was not added to the SceneTree!");
if (p_time > 0) { if (p_time > 0) {
set_wait_time(p_time); set_wait_time(p_time);
} }