diff options
| author | Anton Yabchinskiy <arn@bestmx.ru> | 2015-01-05 23:56:24 +0300 |
|---|---|---|
| committer | Anton Yabchinskiy <arn@bestmx.ru> | 2015-01-05 23:56:24 +0300 |
| commit | a7875c586af74302584544d777b189f4cb85c393 (patch) | |
| tree | f4929f77383d835b5be8b6e099b9db59000af610 /scene/main/node.cpp | |
| parent | 4ab1bcde35a02cfe7b25d630720de1cc81ef5a1a (diff) | |
| parent | 8c4dd8de3919b789eac1a0f030563008bdcd44f5 (diff) | |
| download | redot-engine-a7875c586af74302584544d777b189f4cb85c393.tar.gz | |
Merge branch 'master' of github.com:okamstudio/godot
Diffstat (limited to 'scene/main/node.cpp')
| -rw-r--r-- | scene/main/node.cpp | 5 |
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; } } |