diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-01-02 11:58:01 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-01-02 11:58:01 -0300 |
| commit | 3d4cf876711b5986da68889063df540535f4a63c (patch) | |
| tree | b8f1346645c0b4616063c9b1bcfb70a75f8872a1 /scene | |
| parent | d34f1da861e66fac40f76045292202ad76efe5d2 (diff) | |
| parent | 61fcca71111a35fa1e3e812f99939beba94244e8 (diff) | |
Merge pull request #1065 from marynate/PR-pause-mode-stop
Add Stop pause mode implementation
Diffstat (limited to 'scene')
| -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; } } |