Merge pull request #1262 from seanpaultaylor/next

Next

gameplay/src/Node.cpp

@@ -292,9 +292,17 @@ void Node::setUserPointer(void* pointer, void (*cleanupCallback)(void*))
     }
 }
 
+
+
 void Node::setActive(bool active)
 {
-    _active = active;
+    if (_active != active)
+    {
+        if (_collisionObject)
+            _collisionObject->setEnabled(active);
+
+        _active = active;
+    }
 }
 
 bool Node::isActive() const