Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 16:58:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/highfidelity/hifi into black

Browse source
This commit is contained in:
samcake 2017-08-25 09:03:18 -07:00
commit ce37e88987
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.h
View file

@ -702,8 +702,8 @@ private:
bool _saveAvatarOverrideUrl { false }; bool _saveAvatarOverrideUrl { false };
QObject* _renderEventHandler{ nullptr }; QObject* _renderEventHandler{ nullptr };
LaserPointerManager _laserPointerManager;
RayPickManager _rayPickManager; RayPickManager _rayPickManager;
LaserPointerManager _laserPointerManager;
friend class RenderEventHandler; friend class RenderEventHandler;
}; };