Browse Source

Merge pull request #8663 from Faless/fix_propagate_pause

Fix bug in pause mode propagation
Rémi Verschelde 8 years ago
parent
commit
9aee18ef6b
1 changed files with 1 additions and 1 deletions
  1. 1 1
      scene/main/node.cpp

+ 1 - 1
scene/main/node.cpp

@@ -463,7 +463,7 @@ Node::PauseMode Node::get_pause_mode() const {
 
 
 void Node::_propagate_pause_owner(Node *p_owner) {
 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;
 		return;
 	data.pause_owner = p_owner;
 	data.pause_owner = p_owner;
 	for (int i = 0; i < data.children.size(); i++) {
 	for (int i = 0; i < data.children.size(); i++) {