Merge remote-tracking branch 'upstream/master' into particles

This commit is contained in:
Jeffrey Ventrella 2013-07-15 14:36:32 -07:00
commit 408edc7dca

View file

@ -91,7 +91,11 @@ void LeapManager::enableFakeFingers(bool enable) {
}
bool LeapManager::controllersExist() {
#ifdef LEAP_STUBS
return false;
#else
return _listener && _controller && _controller->devices().count() > 0;
#endif
}
const std::vector<glm::vec3>& LeapManager::getFingerTips() {