unmangle merge

This commit is contained in:
Seth Alves 2017-03-15 09:02:32 -08:00
parent c53b0dff93
commit 816b0b5cfd

View file

@ -760,7 +760,7 @@ void EntityTreeRenderer::mouseDoublePressEvent(QMouseEvent* event) {
PointerEvent pointerEvent(PointerEvent::Press, MOUSE_POINTER_ID,
pos2D, rayPickResult.intersection,
rayPickResult.surfaceNormal, ray.direction,
toPointerButton(*event), toPointerButtons(*event));
toPointerButton(*event), toPointerButtons(*event), Qt::NoModifier);
emit mouseDoublePressOnEntity(rayPickResult.entityID, pointerEvent);