Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-14 10:56:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing merge conflict

Browse source
This commit is contained in:
Dante Ruiz 2017-11-14 14:21:48 -08:00
commit dd043d42c4
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/pointers/src/pointers/Pointer.cpp
View file

@ -176,7 +176,7 @@ void Pointer::generatePointerEvents(unsigned int pointerID, const PickResultPoin
}
// send hoverEnd events if we disable the pointer or disable hovering
if (_hover && (!_enabled && _prevEnabled) || (!doHover && _prevDoHover)) {
if (_hover && ((!_enabled && _prevEnabled) || (!doHover && _prevDoHover))) {
if (_prevHoveredObject.type == ENTITY) {
emit pointerManager->hoverEndEntity(_prevHoveredObject.objectID, hoveredEvent);
} else if (_prevHoveredObject.type == OVERLAY) {