diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-05-06 10:26:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-06 10:26:23 +0200 |
| commit | 9aee18ef6b487592486d67139a8c4b1cc5584b84 (patch) | |
| tree | 1ae2284eb116038399f594431351e8d3f5eed3d1 | |
| parent | 18df047f0b3a61ffb97d7bb64c7579a9e8b6c80f (diff) | |
| parent | a5ce7a98cb4c93883caf39aecd4dcf5486aa4a50 (diff) | |
Merge pull request #8663 from Faless/fix_propagate_pause
Fix bug in pause mode propagation
| -rwxr-xr-x | scene/main/node.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/main/node.cpp b/scene/main/node.cpp index cfee5066b4..bf91b109ad 100755 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -463,7 +463,7 @@ Node::PauseMode Node::get_pause_mode() const { void Node::_propagate_pause_owner(Node *p_owner) { - if (data.pause_mode != PAUSE_MODE_INHERIT) + if (this != p_owner && data.pause_mode != PAUSE_MODE_INHERIT) return; data.pause_owner = p_owner; for (int i = 0; i < data.children.size(); i++) { |