summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authormarynate <mary.w.nate@gmail.com>2014-12-28 00:28:02 +0800
committermarynate <mary.w.nate@gmail.com>2014-12-28 00:29:12 +0800
commit61fcca71111a35fa1e3e812f99939beba94244e8 (patch)
tree123aa33cb786ce86523ec36adc4578e34cd60523 /scene
parent530d717a67cc3acab10270dca700db328aa12891 (diff)
Add Stop pause mode implementation
Diffstat (limited to 'scene')
-rw-r--r--scene/main/node.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index d9b208d6d3..fbdc87a7cc 100644
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -382,6 +382,8 @@ bool Node::can_process() const {
if (get_tree()->is_paused()) {
+ if (data.pause_mode==PAUSE_MODE_STOP)
+ return false;
if (data.pause_mode==PAUSE_MODE_PROCESS)
return true;
if (data.pause_mode==PAUSE_MODE_INHERIT) {
@@ -391,6 +393,9 @@ bool Node::can_process() const {
if (data.pause_owner->data.pause_mode==PAUSE_MODE_PROCESS)
return true;
+
+ if (data.pause_owner->data.pause_mode==PAUSE_MODE_STOP)
+ return false;
}
}